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
0d5d6a0f
Commit
0d5d6a0f
authored
Jul 29, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
d2443e91
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
89 deletions
+33
-89
classcon-form.vue
src/components/course/classcon-form.vue
+11
-9
classconflict-form.vue
src/components/course/classconflict-form.vue
+22
-80
No files found.
src/components/course/classcon-form.vue
View file @
0d5d6a0f
...
...
@@ -32,7 +32,8 @@
<div
class=
"row wrap"
style=
"position:relative;"
v-for=
"(subItem,subIndex) in postMsg.TimeList"
:key=
"subIndex"
>
<div
class=
"col-4"
>
<q-input
filled
v-model=
"subItem.StartTime"
class=
"col-6 q-pr-lg q-pb-lg"
placeholder=
"开始时间"
mask=
"time"
>
<q-input
filled
v-model=
"subItem.StartTime"
class=
"col-6 q-pr-lg q-pb-lg"
placeholder=
"开始时间"
mask=
"time"
>
<template
v-slot:append
>
<q-icon
name=
"access_time"
class=
"cursor-pointer"
>
<q-popup-proxy
transition-show=
"scale"
transition-hide=
"scale"
>
...
...
@@ -47,7 +48,8 @@
</q-input>
</div>
<div
class=
"col-4"
>
<q-input
filled
v-model=
"subItem.EndTime"
class=
"col-6 q-pr-lg q-pb-lg"
placeholder=
"结束时间"
mask=
"time"
>
<q-input
filled
v-model=
"subItem.EndTime"
class=
"col-6 q-pr-lg q-pb-lg"
placeholder=
"结束时间"
mask=
"time"
>
<
template
v-slot:append
>
<q-icon
name=
"access_time"
class=
"cursor-pointer"
>
<q-popup-proxy
transition-show=
"scale"
transition-hide=
"scale"
>
...
...
@@ -99,7 +101,7 @@
persistent
:
true
,
//提交参数
postMsg
:
{
ClassId
:
0
,
ClassId
:
0
,
ChangeType
:
1
,
//调动类型(1-老师,2-教室,3-时段)
ClassPlanIdList
:
[],
//选中的ClassPlanId数组
ClassRoomId
:
0
,
//全局调整--教室编号
...
...
@@ -122,7 +124,7 @@
methods
:
{
//保存信息
saveClass
()
{
if
(
this
.
postMsg
.
ChangeType
==
1
&&
this
.
postMsg
.
TeacherId
==
0
)
{
if
(
this
.
postMsg
.
ChangeType
==
1
&&
this
.
postMsg
.
TeacherId
==
0
)
{
this
.
$q
.
notify
({
type
:
'negative'
,
position
:
"top"
,
...
...
@@ -163,11 +165,11 @@
BatchUpdateClassPlan
(
this
.
postMsg
).
then
(
res
=>
{
if
(
res
.
Code
===
1
)
{
this
.
$q
.
notify
({
icon
:
'iconfont icon-chenggong'
,
color
:
'accent'
,
timeout
:
2000
,
message
:
res
.
Message
,
position
:
'top'
icon
:
'iconfont icon-chenggong'
,
color
:
'accent'
,
timeout
:
2000
,
message
:
res
.
Message
,
position
:
'top'
})
this
.
$emit
(
'success'
);
this
.
$emit
(
'close'
);
...
...
src/components/course/classconflict-form.vue
View file @
0d5d6a0f
...
...
@@ -88,9 +88,10 @@
<q-space
/>
<div
class=
"page-option"
>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
@
click=
"isShowClassForm=true"
label=
"全部重排"
/>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
@
click=
"getCommonEdit(2)"
label=
"修改教室"
/>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
@
click=
"getCommonEdit(1)"
label=
"修改老师"
/>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
@
click=
"getCommonEdit(3)"
label=
"修改时段"
/>
<q-select
filled
stack-label
option-value=
"Id"
option-label=
"Name"
v-model=
"msg.ChangeType"
:options=
"changeTypeList"
label=
"变更类型"
:dense=
"false"
class=
"col-6"
emit-value
map-options
@
input=
"changeTypeResult"
/>
</div>
</
template
>
<
template
v-slot:body-cell-PlanTimeList=
"props"
>
...
...
@@ -140,81 +141,7 @@
</q-banner>
</q-popup-proxy>
</span>
<q-btn
flat
size=
"xs"
icon=
"edit"
color=
"accent"
style=
"font-weight:400;"
label=
"编辑"
@
click=
"getInfo(props.row)"
>
<q-popup-proxy>
<q-banner
v-if=
"isShowEdit"
>
<div
class=
"classConDialog"
>
<div
style=
"margin:10px 0 15px 0;"
>
{{props.row.ClassDate}}课程安排
</div>
<q-select
filled
stack-label
option-value=
"TId"
option-label=
"TeacherName"
v-model=
"addMsg.TeacherId"
ref=
"Teacher_Id"
:options=
"TeacherList"
label=
"关联教师"
:dense=
"false"
class=
"col-6 q-pb-lg"
emit-value
map-options
/>
<q-input
filled
v-model=
"addMsg.ClassDate"
class=
"col-6 q-pb-lg"
mask=
"date"
label=
"上课时间"
>
<
template
v-slot:append
>
<q-icon
name=
"event"
class=
"cursor-pointer"
>
<q-popup-proxy
ref=
"qDateProxy3"
transition-show=
"scale"
transition-hide=
"scale"
>
<q-date
v-model=
"addMsg.ClassDate"
@
input=
' () => $refs.qDateProxy3[0].hide()'
/>
</q-popup-proxy>
</q-icon>
</
template
>
</q-input>
<q-select
filled
stack-label
option-value=
"RoomId"
option-label=
"RoomName"
v-model=
"addMsg.ClassRoomId"
ref=
"ClassRoomId"
:options=
"ClassRoomList"
label=
"关联教室"
:dense=
"false"
class=
"col-6 q-pb-lg"
emit-value
map-options
/>
<div
style=
"display:flex;justify-content:flex-end;margin-bottom:20px;"
>
<q-btn
@
click=
"addStep()"
size=
"10px"
round
color=
"primary"
icon=
"iconfont icon-img_haha"
/>
</div>
<div
class=
"row wrap"
style=
"position:relative;"
v-for=
"(subItem,subIndex) in addMsg.PlanTimeList"
:key=
"subIndex"
>
<div
class=
"col-4"
>
<q-input
filled
v-model=
"subItem.StartTime"
class=
"col-6 q-pr-lg q-pb-lg"
mask=
"time"
>
<
template
v-slot:append
>
<q-icon
name=
"access_time"
class=
"cursor-pointer"
>
<q-popup-proxy
transition-show=
"scale"
transition-hide=
"scale"
>
<q-time
v-model=
"subItem.StartTime"
>
<div
class=
"row items-center justify-end"
>
<q-btn
v-close-popup
label=
"确定"
color=
"primary"
flat
/>
</div>
</q-time>
</q-popup-proxy>
</q-icon>
</
template
>
</q-input>
</div>
<div
class=
"col-4"
>
<q-input
filled
v-model=
"subItem.EndTime"
class=
"col-6 q-pr-lg q-pb-lg"
mask=
"time"
>
<
template
v-slot:append
>
<q-icon
name=
"access_time"
class=
"cursor-pointer"
>
<q-popup-proxy
transition-show=
"scale"
transition-hide=
"scale"
>
<q-time
v-model=
"subItem.EndTime"
>
<div
class=
"row items-center justify-end"
>
<q-btn
v-close-popup
label=
"确定"
color=
"primary"
flat
/>
</div>
</q-time>
</q-popup-proxy>
</q-icon>
</
template
>
</q-input>
</div>
<div
class=
"col-4"
>
<q-input
filled
stack-label
maxlength=
"10"
:dense=
"false"
v-model=
"subItem.TimeHour"
ref=
"TimeHour"
class=
"col-4 q-pr-lg q-pb-lg"
label=
"消耗课时"
:rules=
"[val => !!val || '请填写消耗课时']"
@
keyup
.
native=
"checkPrice(subItem,'TimeHour')"
/>
</div>
<div
class=
"delBtnStyle"
>
<i
@
click=
"delStep(subIndex)"
class=
"iconfont icon-guanbi"
></i>
</div>
</div>
<q-card-actions
align=
"right"
class=
"bg-white"
>
<q-btn
label=
"取消"
flat
color=
"grey-10"
@
click=
"isShowEdit=false"
style=
"font-weight:400 !important"
/>
<q-btn
label=
"确认"
color=
"accent q-px-md"
style=
"font-weight:400 !important"
:loading=
"saveLoading"
@
click=
"saveSteps"
/>
</q-card-actions>
</div>
</q-banner>
</q-popup-proxy>
</q-btn>
</q-td>
</template>
</q-table>
...
...
@@ -255,6 +182,20 @@
data
()
{
return
{
persistent
:
true
,
changeTypeList
:
[{
Id
:
1
,
Name
:
"课程时间"
,
},
{
Id
:
2
,
Name
:
"老师"
,
},
{
Id
:
3
,
Name
:
"教室"
,
},
],
columns
:
[{
name
:
"ClassDate"
,
label
:
"日期"
,
...
...
@@ -295,6 +236,7 @@
ClassId
:
53
,
ClassName
:
""
,
ClassNo
:
""
,
ChangeType
:
1
,
},
isShowEdit
:
false
,
//单行修改参数
...
...
@@ -327,7 +269,7 @@
ChangeType
:
1
,
selected
:
[]
},
saveClassLoading
:
false
saveClassLoading
:
false
}
},
created
()
{
...
...
@@ -470,7 +412,7 @@
}
},
//保存
saveClassFlict
(){
saveClassFlict
()
{
}
}
...
...
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