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
59217df9
Commit
59217df9
authored
Jul 20, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/confucius
parents
da489f74
77d6cb15
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
556 additions
and
55 deletions
+556
-55
temporaryClassbill-form.vue
src/components/sale/temporaryClassbill-form.vue
+2
-2
provisionalInviteForm.vue
src/components/teacher/provisionalInviteForm.vue
+15
-10
activeSummary.vue
src/pages/activity/activeSummary.vue
+2
-2
activeList.vue
src/pages/stuMan/activeList.vue
+2
-36
classPlan.vue
src/pages/stuMan/classPlan.vue
+523
-0
classRecord.vue
src/pages/stuMan/classRecord.vue
+0
-0
studentManager.vue
src/pages/teacher/studentManager.vue
+1
-4
routes.js
src/router/routes.js
+11
-1
No files found.
src/components/sale/temporaryClassbill-form.vue
View file @
59217df9
...
@@ -191,7 +191,7 @@
...
@@ -191,7 +191,7 @@
<div
class=
"backinfo_Item"
style=
"margin-bottom:20px"
>
<div
class=
"backinfo_Item"
style=
"margin-bottom:20px"
>
<span
class=
"role_Line"
style=
"background-color:#02C499"
></span>
上课时间信息
<span
class=
"role_Line"
style=
"background-color:#02C499"
></span>
上课时间信息
</div>
</div>
<q-table
:pagination=
"msg"
no-data-label=
"暂无相关数据"
flat
<q-table
:pagination=
"msg"
no-data-label=
"暂无相关数据"
flat
style=
"border-bottom: 1px solid #DADBDC;"
class=
"sticky-column-table no-bottom-table"
:data=
"setingObj.DataObj.ClassPlanTimeList"
class=
"sticky-column-table no-bottom-table"
:data=
"setingObj.DataObj.ClassPlanTimeList"
:columns=
"columns"
row-key=
"name"
>
:columns=
"columns"
row-key=
"name"
>
<template
v-slot:body-cell-time=
"props"
>
<template
v-slot:body-cell-time=
"props"
>
...
@@ -206,7 +206,7 @@
...
@@ -206,7 +206,7 @@
<div
class=
"backinfo_Item"
style=
"margin-bottom:20px;margin-top:10px;"
>
<div
class=
"backinfo_Item"
style=
"margin-bottom:20px;margin-top:10px;"
>
<span
class=
"role_Line"
style=
"background-color:#8175FB"
></span>
目标学员信息
<span
class=
"role_Line"
style=
"background-color:#8175FB"
></span>
目标学员信息
</div>
</div>
<q-table
:pagination=
"msg"
no-data-label=
"暂无相关数据"
flat
<q-table
:pagination=
"msg"
no-data-label=
"暂无相关数据"
flat
style=
"border-bottom: 1px solid #DADBDC;"
class=
"sticky-column-table no-bottom-table"
:data=
"setingObj.DataObj.OrderGuestList"
class=
"sticky-column-table no-bottom-table"
:data=
"setingObj.DataObj.OrderGuestList"
:columns=
"columns2"
row-key=
"name"
>
:columns=
"columns2"
row-key=
"name"
>
<
template
v-slot:body-cell-process=
"props"
>
<
template
v-slot:body-cell-process=
"props"
>
...
...
src/components/teacher/provisionalInviteForm.vue
View file @
59217df9
...
@@ -74,11 +74,7 @@
...
@@ -74,11 +74,7 @@
</q-item>
</q-item>
</
template
>
</
template
>
</q-select>
</q-select>
<q-input
filled
v-model=
"msg.GuestName"
clearable
class=
"col-6"
label=
"学员姓名"
maxlength=
"200"
@
clear=
"getNotClassStudentList"
>
<
template
v-slot:append
>
<q-icon
name=
"search"
style=
"cursor:pointer;"
@
click=
"getNotClassStudentList"
/>
</
template
>
</q-input>
</div>
</div>
<div
class=
"row items-center q-ma-sm"
>
<div
class=
"row items-center q-ma-sm"
>
</div>
</div>
...
@@ -97,8 +93,17 @@
...
@@ -97,8 +93,17 @@
</q-table>
</q-table>
</div>
</div>
</q-expansion-item>
</q-expansion-item>
<!-- <div class="text-caption q-mb-lg q-px-md text-grey-6">学员列表</div> -->
<!-- <div class="text-caption q-mb-lg q-px-md text-grey-6">学员列表</div> -->
<q-expansion-item
expand-separator
label=
"学员列表"
:value=
"true"
>
<q-expansion-item
expand-separator
label=
"学员列表"
:value=
"true"
>
<div
class=
"row q-mb-md q-col-gutter-lg"
>
<q-input
filled
v-model=
"msg.GuestName"
clearable
class=
"col-6"
label=
"学员姓名"
maxlength=
"200"
@
clear=
"getNotClassStudentList"
>
<
template
v-slot:append
>
<q-icon
name=
"search"
style=
"cursor:pointer;"
@
click=
"getNotClassStudentList"
/>
</
template
>
</q-input>
</div>
<div
class=
"row items-center"
>
<div
class=
"row items-center"
>
<div
class=
"col"
>
<div
class=
"col"
>
<q-table
no-data-label=
"暂无相关数据"
flat
:pagination=
"pages"
<q-table
no-data-label=
"暂无相关数据"
flat
:pagination=
"pages"
...
@@ -199,13 +204,12 @@
...
@@ -199,13 +204,12 @@
},
},
stuList
:
[],
stuList
:
[],
selectedStu
:
[],
selectedStu
:
[],
stuColumns
:
[
stuColumns
:
[{
{
name
:
'Id'
,
name
:
'Id'
,
label
:
'编号'
,
label
:
'编号'
,
field
:
'Id'
,
field
:
'Id'
,
align
:
'left'
align
:
'left'
},{
},
{
name
:
'GuestName'
,
name
:
'GuestName'
,
label
:
'姓名'
,
label
:
'姓名'
,
field
:
'GuestName'
,
field
:
'GuestName'
,
...
@@ -389,8 +393,9 @@
...
@@ -389,8 +393,9 @@
message
:
'操作成功!'
,
message
:
'操作成功!'
,
position
:
'top'
position
:
'top'
})
})
this
.
persistent
=
false
this
.
persistent
=
false
this
.
$emit
(
'success'
)
this
.
$emit
(
'success'
)
this
.
$emit
(
'close'
)
}
else
{
}
else
{
this
.
$q
.
notify
({
this
.
$q
.
notify
({
type
:
'negative'
,
type
:
'negative'
,
...
@@ -407,6 +412,6 @@
...
@@ -407,6 +412,6 @@
</
script
>
</
script
>
<
style
>
<
style
>
</
style
>
</
style
>
src/pages/activity/activeSummary.vue
View file @
59217df9
...
@@ -200,8 +200,8 @@ import Ueditor from "../../components/editor/UeEditor";
...
@@ -200,8 +200,8 @@ import Ueditor from "../../components/editor/UeEditor";
getDetail
(){
getDetail
(){
this
.
apipostDS
(
"/api/Education/GetActivity"
,{
Id
:
this
.
msg
.
Id
},(
res
)
=>
{
this
.
apipostDS
(
"/api/Education/GetActivity"
,{
Id
:
this
.
msg
.
Id
},(
res
)
=>
{
if
(
res
.
data
.
resultCode
===
1
){
if
(
res
.
data
.
resultCode
===
1
){
this
.
msg
.
Summary
=
res
.
data
.
data
.
Summary
this
.
msg
.
Summary
=
res
.
data
.
data
.
Summary
||
''
this
.
setVal
(
res
.
data
.
data
.
Summary
);
this
.
setVal
(
this
.
msg
.
Summary
);
}
}
})
})
},
},
...
...
src/pages/stuMan/activeList.vue
View file @
59217df9
...
@@ -177,11 +177,6 @@
...
@@ -177,11 +177,6 @@
row-key=
"name"
>
row-key=
"name"
>
<
template
v-slot:top=
"props"
>
<
template
v-slot:top=
"props"
>
<div
class=
"col-2 q-table__title"
>
活动列表
</div>
<div
class=
"col-2 q-table__title"
>
活动列表
</div>
<q-space
/>
<div
class=
"page-option"
>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
icon=
"add"
label=
"新增"
@
click=
"goUrl('/activity/activeDetail',null)"
/>
</div>
</
template
>
</
template
>
<
template
v-slot:body-cell-activeName=
"props"
>
<
template
v-slot:body-cell-activeName=
"props"
>
<q-td
:props=
"props"
>
<q-td
:props=
"props"
>
...
@@ -191,7 +186,6 @@
...
@@ -191,7 +186,6 @@
</div>
</div>
{{
props
.
row
.
ActivityName
}}
{{
props
.
row
.
ActivityName
}}
</div>
</div>
</q-td>
</q-td>
</
template
>
</
template
>
<
template
v-slot:body-cell-ActivityTime=
"props"
>
<
template
v-slot:body-cell-ActivityTime=
"props"
>
...
@@ -208,9 +202,6 @@
...
@@ -208,9 +202,6 @@
<
template
v-slot:body-cell-AgeAndPeopleNum=
"props"
>
<
template
v-slot:body-cell-AgeAndPeopleNum=
"props"
>
<q-td
:props=
"props"
>
<q-td
:props=
"props"
>
<div>
<div>
<!--
<div>
{{
props
.
row
.
AgeLimit
==
1
?
'不区分年龄'
:
'区分年龄'
}}
</div>
<div
v-if=
"props.row.AgeLimit==0"
>
范围:
{{
props
.
row
.
StartAge
}}
岁~
{{
props
.
row
.
EndAge
}}
岁
</div>
-->
<!--
<div>
报名人数
</div>
-->
<div
v-if=
"props.row.Distinguish ==1"
>
总人数:
{{
props
.
row
.
ManNum
}}
人
</div>
<div
v-if=
"props.row.Distinguish ==1"
>
总人数:
{{
props
.
row
.
ManNum
}}
人
</div>
<div
v-if=
"props.row.Distinguish ==0"
>
男性:
{{
props
.
row
.
ManNum
}}
人
<span
<div
v-if=
"props.row.Distinguish ==0"
>
男性:
{{
props
.
row
.
ManNum
}}
人
<span
style=
"margin-left:10px"
>
女性:
{{
props
.
row
.
WoManNum
}}
人
</span>
</div>
style=
"margin-left:10px"
>
女性:
{{
props
.
row
.
WoManNum
}}
人
</span>
</div>
...
@@ -225,7 +216,6 @@
...
@@ -225,7 +216,6 @@
<div>
<div>
<div
v-if=
"props.row.IsFree==1"
style=
"color:green;"
>
免费
</div>
<div
v-if=
"props.row.IsFree==1"
style=
"color:green;"
>
免费
</div>
<div
v-if=
"props.row.IsFree==2"
style=
"color:red;"
>
现金价格:
{{
props
.
row
.
Price
}}
元
</div>
<div
v-if=
"props.row.IsFree==2"
style=
"color:red;"
>
现金价格:
{{
props
.
row
.
Price
}}
元
</div>
<!--
<div
v-if=
"props.row.IsFree==2"
style=
"color:red;"
>
现金点数:
{{
props
.
row
.
PointNum
}}
点
</div>
-->
<div>
报名取消确认:
{{
props
.
row
.
IsCancelConfirm
==
1
?
'是'
:
'否'
}}
</div>
<div>
报名取消确认:
{{
props
.
row
.
IsCancelConfirm
==
1
?
'是'
:
'否'
}}
</div>
<div>
内部限制:
{{
props
.
row
.
IsCancelConfirm
==
1
?
'是'
:
'否'
}}
</div>
<div>
内部限制:
{{
props
.
row
.
IsCancelConfirm
==
1
?
'是'
:
'否'
}}
</div>
</div>
</div>
...
@@ -238,37 +228,13 @@
...
@@ -238,37 +228,13 @@
</div>
</div>
</q-td>
</q-td>
</
template
>
</
template
>
<!-- <template v-slot:body-cell-JoinNum="props">
<q-td :props="props">
<div>
{{props.row.JoinNum}} 人
</div>
</q-td>
</template> -->
<
template
v-slot:body-cell-optioned=
"props"
>
<
template
v-slot:body-cell-optioned=
"props"
>
<q-td
:props=
"props"
>
<q-td
:props=
"props"
>
<div>
<div>
<q-btn
flat
size=
"xs"
color=
"accent"
style=
"font-weight:400"
label=
"复制"
<q-btn
flat
size=
"xs"
color=
"accent"
style=
"font-weight:400"
label=
"报名列表"
@
click=
"goUrl('/activity/copyActive',props.row)"
/>
@
click=
"goUrl1('/activity/activeSignUpList',props.row)"
/>
<!--
<q-btn
flat
size=
"xs"
icon=
"edit"
color=
"accent"
style=
"font-weight:400"
label=
"删除"
@
click=
"delActive(props.row)"
/>
-->
<q-btn-dropdown
flat
size=
"xs"
color=
"dark"
label=
"更多"
style=
"margin-left:10px;"
>
<q-btn-dropdown
flat
size=
"xs"
color=
"dark"
label=
"更多"
style=
"margin-left:10px;"
>
<q-list>
<q-list>
<q-item
clickable
v-close-popup
@
click=
"delActive(props.row)"
>
<q-item-section>
<q-item-label>
删除
</q-item-label>
</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
@
click=
"goUrl1('/activity/activeSignUpList',props.row)"
>
<q-item-section>
<q-item-label>
报名列表
</q-item-label>
</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
@
click=
"goUrl('/activity/payment',props.row)"
>
<q-item-section>
<q-item-label>
活动收支
</q-item-label>
</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
@
click=
"goUrl('/activity/activeDetail',props.row)"
>
<q-item
clickable
v-close-popup
@
click=
"goUrl('/activity/activeDetail',props.row)"
>
<q-item-section>
<q-item-section>
<q-item-label>
活动详情
</q-item-label>
<q-item-label>
活动详情
</q-item-label>
...
...
src/pages/stuMan/classPlan.vue
0 → 100644
View file @
59217df9
This diff is collapsed.
Click to expand it.
src/pages/stuMan/classRecord.vue
0 → 100644
View file @
59217df9
src/pages/teacher/studentManager.vue
View file @
59217df9
...
@@ -111,7 +111,7 @@
...
@@ -111,7 +111,7 @@
</
template
>
</
template
>
</q-table>
</q-table>
<StopLesson-form
v-if=
"isShowStopLesson"
:setObj=
"stuObj"
@
success=
"reloadPage"
@
close=
"closeMenuSaveForm"
/>
<StopLesson-form
v-if=
"isShowStopLesson"
:setObj=
"stuObj"
@
success=
"reloadPage"
@
close=
"closeMenuSaveForm"
/>
<ProvisionalInvite-form
v-if=
"isShowProvisionalInvite"
@
close=
"closeMenuSaveForm"
/>
<ProvisionalInvite-form
v-if=
"isShowProvisionalInvite"
@
close=
"closeMenuSaveForm"
/>
</div>
</div>
...
@@ -133,9 +133,6 @@
...
@@ -133,9 +133,6 @@
import
{
import
{
GetStuPageList
GetStuPageList
}
from
"../../api/teacher/student"
}
from
"../../api/teacher/student"
// import classForm from '../../components/course/class-form';
// import classinfoForm from '../../components/course/classinfo-form';
// import othercourseForm from '../../components/course/othercourse-form';
import
StopLessonForm
from
'../../components/teacher/stopLessonForm'
import
StopLessonForm
from
'../../components/teacher/stopLessonForm'
import
ProvisionalInviteForm
from
'../../components/teacher/provisionalInviteForm'
import
ProvisionalInviteForm
from
'../../components/teacher/provisionalInviteForm'
export
default
{
export
default
{
...
...
src/router/routes.js
View file @
59217df9
...
@@ -1026,7 +1026,17 @@ const routes = [{
...
@@ -1026,7 +1026,17 @@ const routes = [{
path
:
"/stuMan/activeList"
,
//学管 活动列表
path
:
"/stuMan/activeList"
,
//学管 活动列表
component
:
()
=>
component
:
()
=>
import
(
"pages/stuMan/activeList"
)
import
(
"pages/stuMan/activeList"
)
}
},
{
path
:
"/stuMan/classPlan"
,
//学管 上课计划
component
:
()
=>
import
(
"pages/stuMan/classPlan"
)
},
{
path
:
"/stuMan/classRecord"
,
//学管 上课记录
component
:
()
=>
import
(
"pages/stuMan/classRecord"
)
},
],
],
},
},
...
...
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