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
fe54bdd9
Commit
fe54bdd9
authored
Jul 27, 2021
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
826f47e1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
53 additions
and
9 deletions
+53
-9
changestatus-form.vue
src/components/course/changestatus-form.vue
+16
-0
changeClassForm.vue
src/components/teacher/changeClassForm.vue
+10
-0
stuClassManage.vue
src/pages/stuMan/stuClassManage.vue
+19
-8
unfinishedStudent.vue
src/pages/stuMan/unfinishedStudent.vue
+2
-1
changeClassManager.vue
src/pages/teacher/changeClassManager.vue
+6
-0
No files found.
src/components/course/changestatus-form.vue
View file @
fe54bdd9
...
@@ -124,6 +124,22 @@
...
@@ -124,6 +124,22 @@
})
})
this
.
$emit
(
'success'
);
this
.
$emit
(
'success'
);
this
.
closeClassSaveForm
();
this
.
closeClassSaveForm
();
if
(
ClassStatus
==
3
&&
res
.
Message
!=
''
)
{
this
.
$q
.
dialog
({
title
:
'提示信息'
,
message
:
"注意,该班级下面任然存在未消耗完课时的学员,请核对学员课时,进行补课处理"
,
cancel
:
true
,
persistent
:
true
,
ok
:
"查看名单"
,
cancel
:
"我知道了"
,
}).
onOk
(()
=>
{
this
.
OpenNewUrl
(
'/stuMan/unfinishedStudent'
,{
ClassId
:
this
.
statusMsg
.
ClassId
})
}).
onCancel
(()
=>
{
});
}
}
else
{
}
else
{
this
.
$q
.
notify
({
this
.
$q
.
notify
({
icon
:
'iconfont icon-chenggong'
,
icon
:
'iconfont icon-chenggong'
,
...
...
src/components/teacher/changeClassForm.vue
View file @
fe54bdd9
...
@@ -1070,6 +1070,12 @@ import { queryCourseDropdownList } from "../../api/course/index";
...
@@ -1070,6 +1070,12 @@ import { queryCourseDropdownList } from "../../api/course/index";
import
{
UploadSelfFile
}
from
"../../api/common/common"
;
import
{
UploadSelfFile
}
from
"../../api/common/common"
;
import
Lockr
from
"lockr"
;
import
Lockr
from
"lockr"
;
export
default
{
export
default
{
props
:
{
ClassId
:
{
type
:
Number
,
default
:
null
},
},
data
()
{
data
()
{
return
{
return
{
TeacherList
:
[],
TeacherList
:
[],
...
@@ -1304,6 +1310,10 @@ export default {
...
@@ -1304,6 +1310,10 @@ export default {
if
(
u
)
{
if
(
u
)
{
this
.
queryClass
.
Teacher_Id
=
u
.
AccountId
;
this
.
queryClass
.
Teacher_Id
=
u
.
AccountId
;
}
}
if
(
this
.
ClassId
){
this
.
msg
.
ClassId
=
this
.
ClassId
;
}
this
.
getClass
();
this
.
getClass
();
this
.
getSchool
();
this
.
getSchool
();
this
.
getCourseList
();
this
.
getCourseList
();
...
...
src/pages/stuMan/stuClassManage.vue
View file @
fe54bdd9
...
@@ -192,10 +192,15 @@
...
@@ -192,10 +192,15 @@
<q-item-label>
状态变更
</q-item-label>
<q-item-label>
状态变更
</q-item-label>
</q-item-section>
</q-item-section>
</q-item>
</q-item>
<q-item
clickable
v-close-popup
@
click
.
stop=
"getStudent(props.row.ClassId)"
>
<
!--
<
q-item
clickable
v-close-popup
@
click
.
stop=
"getStudent(props.row.ClassId)"
>
<q-item-section>
<q-item-section>
<q-item-label>
未完成学员名单
</q-item-label>
<q-item-label>
未完成学员名单
</q-item-label>
</q-item-section>
</q-item-section>
</q-item>
-->
<q-item
v-if=
"props.row.ClassStatus!=3"
clickable
v-close-popup
@
click=
"classApply(props.row.ClassId)"
>
<q-item-section>
<q-item-label>
调课申请
</q-item-label>
</q-item-section>
</q-item>
</q-item>
</q-list>
</q-list>
</q-btn-dropdown>
</q-btn-dropdown>
...
@@ -212,6 +217,8 @@
...
@@ -212,6 +217,8 @@
</othercourseForm>
</othercourseForm>
<changestatusForm
v-if=
"isShowStatusChange"
:seting-obj=
"classObjOption"
@
close=
"closeClassSaveForm"
<changestatusForm
v-if=
"isShowStatusChange"
:seting-obj=
"classObjOption"
@
close=
"closeClassSaveForm"
@
success=
"refreshPage"
></changestatusForm>
@
success=
"refreshPage"
></changestatusForm>
<change-class-form
v-if=
"isShowTiaoke"
:ClassId=
"commonClassId"
@
close=
"closeClassSaveForm"
@
success=
"refreshPage"
></change-class-form>
</div>
</div>
</div>
</div>
</template>
</template>
...
@@ -231,6 +238,7 @@
...
@@ -231,6 +238,7 @@
import
classinfoForm
from
'../../components/course/classinfo-form'
;
import
classinfoForm
from
'../../components/course/classinfo-form'
;
import
othercourseForm
from
'../../components/course/othercourse-form'
;
import
othercourseForm
from
'../../components/course/othercourse-form'
;
import
changestatusForm
from
'../../components/course/changestatus-form'
import
changestatusForm
from
'../../components/course/changestatus-form'
import
changeClassForm
from
'../../components/teacher/changeClassForm.vue'
export
default
{
export
default
{
meta
:
{
meta
:
{
title
:
"班级管理"
title
:
"班级管理"
...
@@ -239,7 +247,8 @@
...
@@ -239,7 +247,8 @@
classForm
,
classForm
,
classinfoForm
,
classinfoForm
,
othercourseForm
,
othercourseForm
,
changestatusForm
changestatusForm
,
changeClassForm
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -338,7 +347,9 @@
...
@@ -338,7 +347,9 @@
isShowClassInfo
:
false
,
//是否显示课程信息
isShowClassInfo
:
false
,
//是否显示课程信息
IsShowOtherCourse
:
false
,
//是否显示其他课程
IsShowOtherCourse
:
false
,
//是否显示其他课程
TeacherList
:[],
TeacherList
:[],
isShowStatusChange
:
false
isShowStatusChange
:
false
,
isShowTiaoke
:
false
,
commonClassId
:
0
}
}
},
},
created
()
{
created
()
{
...
@@ -485,6 +496,7 @@
...
@@ -485,6 +496,7 @@
//关闭关联其他课程弹窗
//关闭关联其他课程弹窗
this
.
IsShowOtherCourse
=
false
;
this
.
IsShowOtherCourse
=
false
;
this
.
isShowStatusChange
=
false
;
this
.
isShowStatusChange
=
false
;
this
.
isShowTiaoke
=
false
;
},
},
GetFirst
(
val
)
{
GetFirst
(
val
)
{
if
(
val
)
{
if
(
val
)
{
...
@@ -528,11 +540,10 @@
...
@@ -528,11 +540,10 @@
}
}
})
})
},
},
//打开未完成学员名单
//调课申请
getStudent
(
ClassId
){
classApply
(
ClassId
){
this
.
OpenNewUrl
(
'/stuMan/unfinishedStudent'
,{
this
.
commonClassId
=
ClassId
;
ClassId
:
ClassId
this
.
isShowTiaoke
=
true
;
})
}
}
}
}
}
}
...
...
src/pages/stuMan/unfinishedStudent.vue
View file @
fe54bdd9
...
@@ -83,7 +83,8 @@
...
@@ -83,7 +83,8 @@
],
],
stuMsg
:
{
stuMsg
:
{
ClassId
:
0
,
ClassId
:
0
,
School_Id
:
-
1
School_Id
:
-
1
,
QNoFinish
:
1
},
},
selectedStudent
:
[],
selectedStudent
:
[],
studentList
:
[],
//学员信息数据
studentList
:
[],
//学员信息数据
...
...
src/pages/teacher/changeClassManager.vue
View file @
fe54bdd9
...
@@ -15,6 +15,12 @@
...
@@ -15,6 +15,12 @@
line-height
:
16px
;
line-height
:
16px
;
border-radius
:
4px
;
border-radius
:
4px
;
}
}
.bill_Rearsons
{
width
:
250px
;
overflow
:
hidden
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
}
</
style
>
</
style
>
<
template
>
<
template
>
...
...
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