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
f7bad1ac
Commit
f7bad1ac
authored
Sep 02, 2024
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
约课
parent
d89019ad
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
496 additions
and
908 deletions
+496
-908
schedu.js
src/api/scheduling/schedu.js
+31
-19
student-shiting.vue
src/components/school/student/student-shiting.vue
+19
-106
TrialClass.vue
src/pages/h5page/TrialClass.vue
+35
-783
audition.vue
src/pages/h5page/audition.vue
+355
-0
statusPrompt.vue
src/pages/h5page/statusPrompt.vue
+56
-0
No files found.
src/api/scheduling/schedu.js
View file @
f7bad1ac
...
@@ -178,7 +178,7 @@ export function DutyCheck(data) {
...
@@ -178,7 +178,7 @@ export function DutyCheck(data) {
/**
/**
* 值班打卡/值班交接
* 值班打卡/值班交接
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
saveDutyCheck
(
data
)
{
export
function
saveDutyCheck
(
data
)
{
return
request
({
return
request
({
...
@@ -190,7 +190,7 @@ export function saveDutyCheck(data) {
...
@@ -190,7 +190,7 @@ export function saveDutyCheck(data) {
/**
/**
* 约课管理
* 约课管理
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
GetReserveClassPage
(
data
)
{
export
function
GetReserveClassPage
(
data
)
{
return
request
({
return
request
({
...
@@ -202,7 +202,7 @@ export function GetReserveClassPage(data) {
...
@@ -202,7 +202,7 @@ export function GetReserveClassPage(data) {
/**
/**
* 设置约课信息
* 设置约课信息
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
SetVisitorReserve
(
data
)
{
export
function
SetVisitorReserve
(
data
)
{
return
request
({
return
request
({
...
@@ -213,9 +213,21 @@ export function SetVisitorReserve(data) {
...
@@ -213,9 +213,21 @@ export function SetVisitorReserve(data) {
}
}
/**
* 预约课程详情
* @param {JSON参数} data
*/
export
function
GetVisitorReserveById
(
data
)
{
return
request
({
url
:
'/VisitorReserve/GetVisitorReserveById'
,
method
:
'post'
,
data
});
}
/**
/**
* 设置约课开课信息
* 设置约课开课信息
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
SetVisitorReserveClass
(
data
)
{
export
function
SetVisitorReserveClass
(
data
)
{
return
request
({
return
request
({
...
@@ -226,7 +238,7 @@ export function SetVisitorReserveClass(data) {
...
@@ -226,7 +238,7 @@ export function SetVisitorReserveClass(data) {
}
}
/**
/**
* 新增留学需求
* 新增留学需求
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
SetStudyAbroad
(
data
)
{
export
function
SetStudyAbroad
(
data
)
{
return
request
({
return
request
({
...
@@ -238,7 +250,7 @@ export function SetStudyAbroad(data) {
...
@@ -238,7 +250,7 @@ export function SetStudyAbroad(data) {
/**
/**
* 新增学员反馈信息
* 新增学员反馈信息
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
SetVisitorReserveFeedback
(
data
)
{
export
function
SetVisitorReserveFeedback
(
data
)
{
return
request
({
return
request
({
...
@@ -249,7 +261,7 @@ export function SetVisitorReserveFeedback(data) {
...
@@ -249,7 +261,7 @@ export function SetVisitorReserveFeedback(data) {
}
}
/**
/**
* 约课管理
* 约课管理
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
queryVisitorReservePage
(
data
)
{
export
function
queryVisitorReservePage
(
data
)
{
return
request
({
return
request
({
...
@@ -262,7 +274,7 @@ export function queryVisitorReservePage(data) {
...
@@ -262,7 +274,7 @@ export function queryVisitorReservePage(data) {
/**
/**
* 删除试听课程
* 删除试听课程
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
RemoveReserveClass
(
data
)
{
export
function
RemoveReserveClass
(
data
)
{
return
request
({
return
request
({
...
@@ -274,7 +286,7 @@ export function RemoveReserveClass(data) {
...
@@ -274,7 +286,7 @@ export function RemoveReserveClass(data) {
/**
/**
* 保存修改听课程
* 保存修改听课程
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
SetReserveClass
(
data
)
{
export
function
SetReserveClass
(
data
)
{
return
request
({
return
request
({
...
@@ -287,7 +299,7 @@ export function SetReserveClass(data) {
...
@@ -287,7 +299,7 @@ export function SetReserveClass(data) {
/**
/**
* 获取约课班级详情
* 获取约课班级详情
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
GetReserveClass
(
data
)
{
export
function
GetReserveClass
(
data
)
{
return
request
({
return
request
({
...
@@ -299,7 +311,7 @@ export function GetReserveClass(data) {
...
@@ -299,7 +311,7 @@ export function GetReserveClass(data) {
/**
/**
* 修改预约状态
* 修改预约状态
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
setVisitorReserveStatus
(
data
)
{
export
function
setVisitorReserveStatus
(
data
)
{
return
request
({
return
request
({
...
@@ -311,7 +323,7 @@ export function setVisitorReserveStatus(data) {
...
@@ -311,7 +323,7 @@ export function setVisitorReserveStatus(data) {
/**
/**
* 删除约课数据
* 删除约课数据
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
RemoveVisitorReserve
(
data
)
{
export
function
RemoveVisitorReserve
(
data
)
{
return
request
({
return
request
({
...
@@ -323,7 +335,7 @@ export function RemoveVisitorReserve(data) {
...
@@ -323,7 +335,7 @@ export function RemoveVisitorReserve(data) {
/**
/**
* 获取交接班次
* 获取交接班次
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
GetHandoverShiftList
()
{
export
function
GetHandoverShiftList
()
{
return
request
({
return
request
({
...
@@ -335,7 +347,7 @@ export function GetHandoverShiftList() {
...
@@ -335,7 +347,7 @@ export function GetHandoverShiftList() {
/**
/**
* 获取节假日计划分页列表
* 获取节假日计划分页列表
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
getHolidayPlanList
(
data
)
{
export
function
getHolidayPlanList
(
data
)
{
return
request
({
return
request
({
...
@@ -347,7 +359,7 @@ export function getHolidayPlanList(data) {
...
@@ -347,7 +359,7 @@ export function getHolidayPlanList(data) {
/**
/**
* 获取节假日计划详情
* 获取节假日计划详情
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
getHolidayInfo
(
data
)
{
export
function
getHolidayInfo
(
data
)
{
return
request
({
return
request
({
...
@@ -359,7 +371,7 @@ export function getHolidayInfo(data) {
...
@@ -359,7 +371,7 @@ export function getHolidayInfo(data) {
/**
/**
* 新增节假日计划
* 新增节假日计划
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
setHolidayPlan
(
data
)
{
export
function
setHolidayPlan
(
data
)
{
return
request
({
return
request
({
...
@@ -371,7 +383,7 @@ export function setHolidayPlan(data) {
...
@@ -371,7 +383,7 @@ export function setHolidayPlan(data) {
/**
/**
* 删除节假日计划
* 删除节假日计划
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
delHolidayPlan
(
data
)
{
export
function
delHolidayPlan
(
data
)
{
return
request
({
return
request
({
...
@@ -382,7 +394,7 @@ export function delHolidayPlan(data) {
...
@@ -382,7 +394,7 @@ export function delHolidayPlan(data) {
}
}
/**
/**
* 获取日期范围 所有排课计划列表
* 获取日期范围 所有排课计划列表
* @param {JSON参数} data
* @param {JSON参数} data
*/
*/
export
function
getToDayCoursePlanList
(
data
)
{
export
function
getToDayCoursePlanList
(
data
)
{
return
request
({
return
request
({
...
@@ -390,4 +402,4 @@ export function getToDayCoursePlanList(data) {
...
@@ -390,4 +402,4 @@ export function getToDayCoursePlanList(data) {
method
:
'post'
,
method
:
'post'
,
data
:
data
data
:
data
})
})
}
}
\ No newline at end of file
src/components/school/student/student-shiting.vue
View file @
f7bad1ac
...
@@ -32,10 +32,10 @@
...
@@ -32,10 +32,10 @@
跟班
跟班
</q-chip>
</q-chip>
<div
v-if=
"tItem.ReservationDate&&tItem.ReservationDate.length>0&&tItem.ReservationDate!='0001-01-01T00:00:00'"
>
<div
v-if=
"tItem.ReservationDate&&tItem.ReservationDate.length>0&&tItem.ReservationDate!='0001-01-01T00:00:00'"
>
试听日期:
{{
timeFormatSeconds
(
tItem
.
ReservationDate
)
}}
试听日期:
{{
timeFormatSeconds
(
tItem
.
ReservationDate
)
}}
</div>
</div>
<div
v-if=
"tItem.Demand&&tItem.Demand.length>0"
>
<div
v-if=
"tItem.Demand&&tItem.Demand.length>0"
>
试听需求:
{{
tItem
.
Demand
}}
试听需求:
{{
tItem
.
Demand
}}
</div>
</div>
<div>
<div>
预约时间:
{{
tItem
.
ClassDateStr
}}
{{
tItem
.
ClassTime
}}
预约时间:
{{
tItem
.
ClassDateStr
}}
{{
tItem
.
ClassTime
}}
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
</div>
</div>
<div
style=
"margin-top:10px;width:150px;"
<div
style=
"margin-top:10px;width:150px;"
class=
"visit_delete text-negative"
>
class=
"visit_delete text-negative"
>
<span
@
click=
"DeleteVisitorReserve(tItem.Id)"
style=
"margin-right:10px;"
>
删除
</span>
<span
@
click=
"DeleteVisitorReserve(tItem.Id)"
style=
"margin-right:10px;"
>
删除
</span>
<span
v-if=
"tItem.ReserveClassId>0"
style=
"margin-right:10px;"
@
click=
"fabkuiMsg.IsShow=true,fabkuiMsg.Id=tItem.Id,fabkuiMsg.Feedback=tItem.Feedback"
>
反馈
</span>
<span
v-if=
"tItem.ReserveClassId>0"
style=
"margin-right:10px;"
@
click=
"fabkuiMsg.IsShow=true,fabkuiMsg.Id=tItem.Id,fabkuiMsg.Feedback=tItem.Feedback"
>
反馈
</span>
<span
v-if=
"tItem.ReserveClassId==0"
@
click=
"ShitingKaiKe(tItem)"
>
试听课开课
</span>
<span
v-if=
"tItem.ReserveClassId==0"
@
click=
"ShitingKaiKe(tItem)"
>
试听课开课
</span>
</div>
</div>
...
@@ -87,58 +87,11 @@
...
@@ -87,58 +87,11 @@
<el-button
type=
"primary"
@
click=
"saveFankuiForm()"
>
确 定
</el-button>
<el-button
type=
"primary"
@
click=
"saveFankuiForm()"
>
确 定
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
<el-dialog
title=
"试听开课"
:visible
.
sync=
"VisitorReserveClassMsg.IsShow"
width=
"30%"
@
close=
"closeShitingKaiKe()"
>
<el-dialog
title=
"试听开课"
:visible
.
sync=
"VisitorReserveClassMsg.IsShow"
width=
"30%"
>
<audition
:VisitorReserveClassMsg=
"VisitorReserveClassMsg"
<div
class=
"row wrap"
>
@
close=
"closeShitingKaiKe()"
<div
style=
"width:100%;margin-bottom:15px;"
>
试听时间:
<span
style=
"color:red;"
>
{{timeFormatSeconds(VisitorReserveClassMsg.ReservationDate)}}
</span></div>
@
success=
"SetVisitorReserveClass"
></audition>
<div
style=
"width:100%;margin-bottom:15px;"
>
试听需求:
<span
style=
"color:red;"
>
{{VisitorReserveClassMsg.Demand}}
</span></div>
</el-dialog>
</div>
<div
class=
"row studentDate"
>
<q-field
filled
class=
"col-6 q-pb-lg q-pr-lg"
dense
>
<
template
v-slot:control
>
<el-date-picker
v-model=
"VisitorReserveClassMsg.ClassDate"
ref=
"ClassDate"
:rules=
"[val => !!val || '请选择预约日期']"
style=
"width:225px"
size=
"mini"
type=
"date"
placeholder=
"预约日期"
value-format=
"yyyy-MM-dd"
>
</el-date-picker>
</
template
>
</q-field>
<div
class=
"col-6 q-pr-lg Student_Date "
>
<q-field
filled
class=
"q-pb-lg"
dense
>
<
template
v-slot:control
>
<el-time-select
v-model=
"VisitorReserveClassMsg.ClassTime"
size=
"mini"
ref=
"ClassTime"
style=
"width:50%"
:picker-options=
"
{
start: '09:00',
step: '00:15',
end: '21:00',
maxTime: VisitorReserveClassMsg.EndTime
}" placeholder="预约开始时间">
</el-time-select>
<el-time-select
v-model=
"VisitorReserveClassMsg.EndTime"
size=
"mini"
dense
ref=
"EndTime"
style=
"width:50%"
:picker-options=
"
{
start: '09:00',
step: '00:15',
end: '21:00',
minTime: VisitorReserveClassMsg.ClassTime
}" placeholder="预约结束时间">
</el-time-select>
</
template
>
</q-field>
</div>
</div>
<div
class=
"row wrap"
>
<q-select
filled
stack-label
option-value=
"TId"
option-label=
"TeacherName"
v-model=
"VisitorReserveClassMsg.TeacherId"
ref=
"TeacherId"
:options=
"TeacherList"
label=
"选择教师"
dense
class=
"col-6 q-pb-lg q-pr-lg"
emit-value
map-options
/>
<q-select
filled
stack-label
option-value=
"RoomId"
dense
option-label=
"RoomName"
v-model=
"VisitorReserveClassMsg.ClassRoomId"
ref=
"ClassRoomId"
:options=
"ClassRoomList"
label=
"关联教室"
class=
"col-6 q-pb-lg q-pr-lg"
emit-value
map-options
/>
<q-select
filled
stack-label
option-value=
"Id"
dense
option-label=
"LessonName"
v-model=
"VisitorReserveClassMsg.TrialLessonId"
:options=
"TrialList"
label=
"试听课程"
class=
"col-6 q-pb-lg q-pr-lg"
emit-value
map-options
/>
</div>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"closeShitingKaiKe()"
>
取 消
</el-button>
<el-button
type=
"primary"
@
click=
"SetVisitorReserveClass()"
>
确 定
</el-button>
</div>
</el-dialog>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -157,7 +110,8 @@
...
@@ -157,7 +110,8 @@
}
from
"../../../api/school/index"
;
}
from
"../../../api/school/index"
;
import
reserveclassForm
from
"./reserveclass-form"
;
import
reserveclassForm
from
"./reserveclass-form"
;
import
reserveclasskaikeform
from
"./reserveclasskaikeform"
;
import
reserveclasskaikeform
from
"./reserveclasskaikeform"
;
import
audition
from
"../../../pages/h5page/audition"
;
export
default
{
export
default
{
meta
:
{
meta
:
{
title
:
""
title
:
""
...
@@ -165,7 +119,8 @@
...
@@ -165,7 +119,8 @@
components
:
{
components
:
{
reserveclassForm
,
reserveclassForm
,
reserveclasskaikeform
,
reserveclasskaikeform
,
UeEditor
UeEditor
,
audition
},
},
props
:
{
props
:
{
saveObj
:
{
saveObj
:
{
...
@@ -250,60 +205,17 @@
...
@@ -250,60 +205,17 @@
if
(
seconds
<
10
)
seconds
=
'0'
+
seconds
;
if
(
seconds
<
10
)
seconds
=
'0'
+
seconds
;
timeStr
+=
' '
+
hours
+
':'
+
min
+
':'
+
seconds
;
timeStr
+=
' '
+
hours
+
':'
+
min
+
':'
+
seconds
;
}
}
timeStr
=
year
+
'-'
+
month
+
'-'
+
day
+
timeStr
;
timeStr
=
year
+
'-'
+
month
+
'-'
+
day
+
timeStr
;
return
timeStr
;
return
timeStr
;
},
},
//保存
//保存
SetVisitorReserveClass
()
{
SetVisitorReserveClass
()
{
if
(
this
.
VisitorReserveClassMsg
.
ClassDate
==
""
)
{
this
.
$q
.
notify
({
this
.
$emit
(
"success"
);
type
:
"negative"
,
this
.
closeShitingKaiKe
();
position
:
"top"
,
this
.
getList
();
timeout
:
2000
,
message
:
"请选择预约日期!"
});
return
;
}
if
(
this
.
VisitorReserveClassMsg
.
ClassTime
==
""
)
{
this
.
$q
.
notify
({
type
:
"negative"
,
position
:
"top"
,
timeout
:
2000
,
message
:
"请选择预约开始时间!"
});
return
;
}
if
(
this
.
VisitorReserveClassMsg
.
EndTime
==
""
)
{
this
.
$q
.
notify
({
type
:
"negative"
,
position
:
"top"
,
timeout
:
2000
,
message
:
"请选择预约结束时间!"
});
return
;
}
SetVisitorReserveClass
(
this
.
VisitorReserveClassMsg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
this
.
$q
.
notify
({
icon
:
"iconfont icon-chenggong"
,
color
:
"accent"
,
timeout
:
2000
,
message
:
res
.
Message
,
position
:
"top"
});
this
.
$emit
(
"success"
);
}
else
{
this
.
$q
.
notify
({
type
:
"negative"
,
position
:
"top"
,
timeout
:
2000
,
message
:
res
.
Message
});
}
this
.
closeShitingKaiKe
();
this
.
getList
();
});
},
},
closeShitingKaiKe
(){
closeShitingKaiKe
(){
this
.
VisitorReserveClassMsg
.
Id
=
0
;
this
.
VisitorReserveClassMsg
.
Id
=
0
;
...
@@ -322,6 +234,7 @@ return timeStr;
...
@@ -322,6 +234,7 @@ return timeStr;
this
.
VisitorReserveClassMsg
.
ClassPlanId
=
0
;
this
.
VisitorReserveClassMsg
.
ClassPlanId
=
0
;
this
.
VisitorReserveClassMsg
.
Demand
=
""
;
this
.
VisitorReserveClassMsg
.
Demand
=
""
;
this
.
VisitorReserveClassMsg
.
IsShow
=
false
;
this
.
VisitorReserveClassMsg
.
IsShow
=
false
;
this
.
$forceUpdate
()
},
},
//试听课开课
//试听课开课
ShitingKaiKe
(
item
){
ShitingKaiKe
(
item
){
...
...
src/pages/h5page/TrialClass.vue
View file @
f7bad1ac
This diff is collapsed.
Click to expand it.
src/pages/h5page/audition.vue
0 → 100644
View file @
f7bad1ac
This diff is collapsed.
Click to expand it.
src/pages/h5page/statusPrompt.vue
0 → 100644
View file @
f7bad1ac
<
template
>
<div
class=
"pay-OuterFrame"
>
<div
class=
"popup-box"
>
<div
class=
"popup-title"
>
<div
style=
"margin-top: 230px;"
>
<img
style=
"width:80px;height:80px;"
src=
"../../assets/images/da_gou.png"
/>
</div>
<div
style=
"font-size: 18px;margin-top: 15px;"
>
{{
isSuccessTitle
}}
</div>
</div>
</div>
</div>
</
template
>
<
script
>
export
default
{
props
:[
"isSuccess"
,
"isSuccessTitle"
],
components
:
{
},
data
()
{
return
{
}
},
computed
:
{
},
mounted
(){
},
methods
:
{
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.popup-box
{
position
:
fixed
;
top
:
0
;
left
:
0
;
right
:
0
;
bottom
:
0
;
background
:
#ffffff
;
z-index
:
3
;
}
.popup-title
{
padding
:
400rpx
0
;
text-align
:
center
;
}
.popup-title
text
{
display
:
block
;
margin-top
:
30rpx
;
font-size
:
35rpx
;
}
</
style
>
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