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
240ba3c9
Commit
240ba3c9
authored
Aug 11, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增修改老师
parent
ed4cf414
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
42 additions
and
14 deletions
+42
-14
subscribe.js
src/api/studyabroad/subscribe.js
+11
-0
detail.vue
src/components/stuMan/subscribe/detail.vue
+29
-10
subscribeForm.vue
src/components/stuMan/subscribe/subscribeForm.vue
+2
-4
No files found.
src/api/studyabroad/subscribe.js
View file @
240ba3c9
...
@@ -203,4 +203,15 @@ export function getScrollCourseChapterName(data) {
...
@@ -203,4 +203,15 @@ export function getScrollCourseChapterName(data) {
method
:
'post'
,
method
:
'post'
,
data
data
})
})
}
/**
* 调整约课老师
*/
export
function
SetScrollTeacher
(
data
)
{
return
request
({
url
:
'/Scroll/SetScrollTeacher'
,
method
:
'post'
,
data
})
}
}
\ No newline at end of file
src/components/stuMan/subscribe/detail.vue
View file @
240ba3c9
...
@@ -4,12 +4,14 @@
...
@@ -4,12 +4,14 @@
<q-field
filled
label=
"老师"
stack-label
class=
"col-6"
>
<q-field
filled
label=
"老师"
stack-label
class=
"col-6"
>
<template
v-slot:control
>
<template
v-slot:control
>
<div>
{{
saveObj
.
TeacherName
}}
</div>
<div>
{{
saveObj
.
TeacherName
}}
</div>
<q-btn
color=
"accent"
size=
"xs"
label=
"修改"
v-if=
"auth.IsEdit&&saveObj.ClassType==3&&(saveObj.State==1||saveObj.State==2)"
@
click=
"modifyTeacher"
class=
"q-ml-md"
/>
</
template
>
</
template
>
</q-field>
</q-field>
<q-field
filled
label=
"教室"
stack-label
class=
"col-6"
>
<q-field
filled
label=
"教室"
stack-label
class=
"col-6"
>
<
template
v-slot:control
>
<
template
v-slot:control
>
<div>
{{
saveObj
.
RoomName
}}
</div>
<div>
{{
saveObj
.
RoomName
}}
</div>
<q-btn
color=
"accent"
size=
"xs"
label=
"修改"
v-if=
"auth.IsEdit&&saveObj.ClassType==3
"
@
click=
"modifyRoom"
<q-btn
color=
"accent"
size=
"xs"
label=
"修改"
v-if=
"auth.IsEdit&&saveObj.ClassType==3 &&(saveObj.State==1||saveObj.State==2)
"
@
click=
"modifyRoom"
class=
"q-ml-md"
/>
class=
"q-ml-md"
/>
</
template
>
</
template
>
</q-field>
</q-field>
...
@@ -80,7 +82,7 @@
...
@@ -80,7 +82,7 @@
<
template
v-slot:control
>
<
template
v-slot:control
>
<div
v-if=
"saveObj.AppointState == 1 && auth.IsEdit"
>
<div
v-if=
"saveObj.AppointState == 1 && auth.IsEdit"
>
<div
class=
"q-mt-sm flex justify-start"
>
<div
class=
"q-mt-sm flex justify-start"
>
<q-btn
color=
"accent"
size=
"xs"
label=
"调课"
@
click=
"showChangeCourse"
:disable=
"checkStuType2.length == 0"
<q-btn
color=
"accent"
size=
"xs"
label=
"调课"
@
click=
"showChangeCourse"
:disable=
"checkStuType2.length == 0"
class=
"q-mr-sm"
/>
class=
"q-mr-sm"
/>
<q-btn
color=
"accent"
size=
"xs"
label=
"取消预约"
@
click=
"cancelSub()"
:disable=
"checkStuType2.length == 0"
<q-btn
color=
"accent"
size=
"xs"
label=
"取消预约"
@
click=
"cancelSub()"
:disable=
"checkStuType2.length == 0"
class=
"q-mr-sm"
/>
class=
"q-mr-sm"
/>
...
@@ -97,7 +99,8 @@
...
@@ -97,7 +99,8 @@
<div
class=
"row col-12 relative-position"
v-else
>
<div
class=
"row col-12 relative-position"
v-else
>
<div
class=
"absolute"
style=
"top:-20px;right:0"
v-if=
"auth.IsEdit"
>
<div
class=
"absolute"
style=
"top:-20px;right:0"
v-if=
"auth.IsEdit"
>
<q-btn
color=
"accent"
size=
"xs"
label=
"取消"
@
click=
"showCancelDig = true"
/>
<q-btn
color=
"accent"
size=
"xs"
label=
"取消"
@
click=
"showCancelDig = true"
/>
<q-btn
style=
"display:none;"
color=
"accent"
size=
"xs"
label=
"补录"
@
click=
"showMakeUpDig = true"
class=
"q-ml-sm"
/>
<q-btn
style=
"display:none;"
color=
"accent"
size=
"xs"
label=
"补录"
@
click=
"showMakeUpDig = true"
class=
"q-ml-sm"
/>
</div>
</div>
<span
v-for=
"(x, y) in saveObj.GuestList"
:key=
"y"
>
<span
v-for=
"(x, y) in saveObj.GuestList"
:key=
"y"
>
...
@@ -125,6 +128,8 @@
...
@@ -125,6 +128,8 @@
<CancelSub
v-model=
"showCancelDig"
:saveObj=
"saveObj"
:date=
"dateObj.date"
@
success=
"cancelHandle"
></CancelSub>
<CancelSub
v-model=
"showCancelDig"
:saveObj=
"saveObj"
:date=
"dateObj.date"
@
success=
"cancelHandle"
></CancelSub>
<Room
v-model=
"showRoomDig"
:room=
"saveObj.RoomId"
:saveObj=
"saveObj"
:date=
"dateObj.date"
@
success=
"roomHandle"
>
<Room
v-model=
"showRoomDig"
:room=
"saveObj.RoomId"
:saveObj=
"saveObj"
:date=
"dateObj.date"
@
success=
"roomHandle"
>
</Room>
</Room>
<changeTeacher
v-model=
"showTeacherDig"
:saveObj=
"saveObj"
:date=
"dateObj.date"
@
success=
"teacherHandle"
>
</changeTeacher>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -136,12 +141,14 @@
...
@@ -136,12 +141,14 @@
import
MakeUp
from
"./makeUp.vue"
import
MakeUp
from
"./makeUp.vue"
import
CancelSub
from
'./deleteStu'
import
CancelSub
from
'./deleteStu'
import
Room
from
"./changeRoom.vue"
import
Room
from
"./changeRoom.vue"
import
changeTeacher
from
"./changeTeacher.vue"
export
default
{
export
default
{
components
:
{
components
:
{
ChangeCourse
,
ChangeCourse
,
MakeUp
,
MakeUp
,
CancelSub
,
CancelSub
,
Room
Room
,
changeTeacher
},
},
props
:
{
props
:
{
dateObj
:
{
dateObj
:
{
...
@@ -171,12 +178,17 @@
...
@@ -171,12 +178,17 @@
showChangeDig
:
false
,
showChangeDig
:
false
,
showMakeUpDig
:
false
,
showMakeUpDig
:
false
,
showCancelDig
:
false
,
showCancelDig
:
false
,
showRoomDig
:
false
,
showRoomDig
:
false
,
//显示修改教室
showTeacherDig
:
false
,
//显示修改老师
CourseObj
:
{},
CourseObj
:
{},
saveLoading
:
false
,
saveLoading
:
false
,
};
};
},
},
methods
:
{
methods
:
{
//修改老师
modifyTeacher
()
{
this
.
showTeacherDig
=
true
;
},
//取消预约
//取消预约
cancelSub
()
{
cancelSub
()
{
let
that
=
this
;
let
that
=
this
;
...
@@ -214,7 +226,6 @@
...
@@ -214,7 +226,6 @@
})
})
.
onCancel
(()
=>
{});
.
onCancel
(()
=>
{});
},
},
//确认约课
//确认约课
confirmSub
()
{
confirmSub
()
{
if
(
this
.
saveObj
.
EnrollNum
<
this
.
saveObj
.
ScrollMinNum
)
{
if
(
this
.
saveObj
.
EnrollNum
<
this
.
saveObj
.
ScrollMinNum
)
{
...
@@ -225,14 +236,14 @@
...
@@ -225,14 +236,14 @@
});
});
return
;
return
;
}
}
this
.
saveLoading
=
true
;
this
.
saveLoading
=
true
;
const
msg
=
{
const
msg
=
{
Date
:
this
.
dateObj
.
date
,
Date
:
this
.
dateObj
.
date
,
TeacherId
:
this
.
saveObj
.
Tid
,
TeacherId
:
this
.
saveObj
.
Tid
,
ShiftSort
:
this
.
saveObj
.
ShiftSort
ShiftSort
:
this
.
saveObj
.
ShiftSort
};
};
SetSureAppointment
(
msg
).
then
(
res
=>
{
SetSureAppointment
(
msg
).
then
(
res
=>
{
this
.
saveLoading
=
false
;
this
.
saveLoading
=
false
;
if
(
res
.
Code
==
1
)
{
if
(
res
.
Code
==
1
)
{
this
.
$q
.
notify
({
this
.
$q
.
notify
({
message
:
"操作成功"
,
message
:
"操作成功"
,
...
@@ -270,10 +281,17 @@
...
@@ -270,10 +281,17 @@
});
});
this
.
$emit
(
"success"
);
this
.
$emit
(
"success"
);
},
},
//教室信息改变
roomHandle
(
val
)
{
roomHandle
(
val
)
{
this
.
$set
(
this
.
saveObj
,
"RoomName"
,
val
.
Name
);
this
.
$set
(
this
.
saveObj
,
"RoomName"
,
val
.
Name
);
this
.
$emit
(
"success"
,
val
);
this
.
$emit
(
"success"
,
val
);
},
},
//教师信息改变
teacherHandle
(
val
)
{
this
.
$set
(
this
.
saveObj
,
"TeacherName"
,
val
.
Name
);
this
.
$set
(
this
.
saveObj
,
"Tid"
,
val
.
Id
);
this
.
$emit
(
"success"
,
val
);
},
isShowTag
(
arr
,
min
)
{
isShowTag
(
arr
,
min
)
{
let
n
=
0
;
let
n
=
0
;
arr
.
map
(
e
=>
{
arr
.
map
(
e
=>
{
...
@@ -292,4 +310,5 @@
...
@@ -292,4 +310,5 @@
}
}
}
}
};
};
</
script
>
\ No newline at end of file
</
script
>
src/components/stuMan/subscribe/subscribeForm.vue
View file @
240ba3c9
...
@@ -136,7 +136,7 @@
...
@@ -136,7 +136,7 @@
</q-select>
</q-select>
</div>
</div>
<div
class=
"col-3 q-pt-md q-pl-md"
>
<div
class=
"col-3 q-pt-md q-pl-md"
>
<q-btn
size=
"sm"
color=
"accent"
label=
"添加"
@
click=
"subscribeCourse"
/>
<q-btn
v-if=
"(saveObj.State==1||saveObj.State==2)"
size=
"sm"
color=
"accent"
label=
"添加"
@
click=
"subscribeCourse"
/>
</div>
</div>
</div>
</div>
<div
class=
"row col-12"
style=
"margin-top: 20px;"
>
<div
class=
"row col-12"
style=
"margin-top: 20px;"
>
...
@@ -212,7 +212,7 @@
...
@@ -212,7 +212,7 @@
<tfoot>
<tfoot>
<tr>
<tr>
<td
colspan=
"1"
style=
"text-align: center;"
>
<td
colspan=
"1"
style=
"text-align: center;"
>
<q-btn
size=
"sm"
color=
"accent"
label=
"保存"
@
click=
"SaveStuAppointment"
:loading=
"addLoading"
/>
<q-btn
v-if=
"(saveObj.State==1||saveObj.State==2)"
size=
"sm"
color=
"accent"
label=
"保存"
@
click=
"SaveStuAppointment"
:loading=
"addLoading"
/>
</td>
</td>
</tr>
</tr>
</tfoot>
</tfoot>
...
@@ -555,8 +555,6 @@
...
@@ -555,8 +555,6 @@
//添加学员
//添加学员
subscribeCourse
()
{
subscribeCourse
()
{
if
(
this
.
editType
==
1
)
{
if
(
this
.
editType
==
1
)
{
if
(
this
.
stuInfo
.
AppointDate
)
{
if
(
this
.
stuInfo
.
AppointDate
)
{
if
(
if
(
new
Date
(
this
.
dateObj
.
date
).
getTime
()
<
new
Date
(
this
.
dateObj
.
date
).
getTime
()
<
...
...
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