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
b6e02555
Commit
b6e02555
authored
May 06, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
32cd7717
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
98 deletions
+4
-98
schedulingPlan.vue
src/pages/scheduling/schedulingPlan.vue
+0
-18
schedulingRecord.vue
src/pages/scheduling/schedulingRecord.vue
+4
-80
No files found.
src/pages/scheduling/schedulingPlan.vue
View file @
b6e02555
...
@@ -306,24 +306,6 @@
...
@@ -306,24 +306,6 @@
}
}
this
.
getList
()
this
.
getList
()
},
},
getStatus
(
props
,
obj
)
{
// let beginDateStr = props + ' ' + obj.StartTime;
// let endDateStr = props + ' ' + obj.EndTime;
// let str = 0;
// let curDate = new Date();
// let beginDate = new Date(beginDateStr);
// let endDate = new Date(endDateStr);
// if (curDate
<
beginDate
)
{
// str = 1 //未开始
// }
// if (curDate >= beginDate && curDate
<=
endDate
)
{
// str = 2 //进行中
// }
// if (curDate > endDate) {
// str = 3 //已结束
// }
// return str;
}
},
},
}
}
...
...
src/pages/scheduling/schedulingRecord.vue
View file @
b6e02555
...
@@ -40,10 +40,9 @@
...
@@ -40,10 +40,9 @@
<q-table
:pagination=
"msg"
:loading=
"loading"
no-data-label=
"暂无相关数据"
flat
class=
"sticky-column-table"
<q-table
:pagination=
"msg"
:loading=
"loading"
no-data-label=
"暂无相关数据"
flat
class=
"sticky-column-table"
separator=
"none"
title=
"排班计划"
:data=
"dataList"
:columns=
"columns"
row-key=
"name"
>
separator=
"none"
title=
"排班计划"
:data=
"dataList"
:columns=
"columns"
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
/>
<q-space
/>
<div
class=
"page-option"
>
<div
class=
"page-option"
>
<q-btn
color=
"accent"
size=
"sm"
icon=
"add"
label=
"新增排班计划"
@
click=
"EditSchedu(null)"
/>
</div>
</div>
</
template
>
</
template
>
<
template
v-slot:body=
"props"
>
<
template
v-slot:body=
"props"
>
...
@@ -93,21 +92,17 @@
...
@@ -93,21 +92,17 @@
:input=
"true"
@
input=
"changePage"
/>
:input=
"true"
@
input=
"changePage"
/>
</
template
>
</
template
>
</q-table>
</q-table>
<schedul-form
v-if=
"isShowSchedu"
:save-obj=
"scheduOption"
@
close=
"closeScheduForm"
@
success=
"refreshPage"
>
</schedul-form>
</div>
</div>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
import
{
GetDutyPlanPage
,
GetDutyPlanPage
,
RemoveDutyPlan
}
from
'../../api/scheduling/schedu'
}
from
'../../api/scheduling/schedu'
import
{
import
{
getSchoolDropdown
getSchoolDropdown
}
from
'../../api/school/index'
;
//获取校区列表
}
from
'../../api/school/index'
;
//获取校区列表
import
schedulForm
from
'../../components/schedul/schedul-form'
import
{
import
{
queryEmployee
queryEmployee
}
from
'../../api/users/user'
;
//获取员工
}
from
'../../api/users/user'
;
//获取员工
...
@@ -116,7 +111,7 @@
...
@@ -116,7 +111,7 @@
title
:
"排班计划"
title
:
"排班计划"
},
},
components
:
{
components
:
{
schedulForm
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -176,9 +171,8 @@
...
@@ -176,9 +171,8 @@
StartDate
:
""
,
//开始日期
StartDate
:
""
,
//开始日期
EndDate
:
""
,
//结束日期
EndDate
:
""
,
//结束日期
EmployeeIds
:
[],
//员工列表
EmployeeIds
:
[],
//员工列表
IsFinish
:
1
,
//已完成值班
},
},
isShowSchedu
:
false
,
scheduOption
:
null
,
pageCount
:
0
,
pageCount
:
0
,
schoolOptions
:
[],
//校区列表
schoolOptions
:
[],
//校区列表
EmployeeList
:
[],
//员工列表
EmployeeList
:
[],
//员工列表
...
@@ -244,81 +238,11 @@
...
@@ -244,81 +238,11 @@
}
}
})
})
},
},
//删除排班计划
RemovePlan
(
Id
)
{
this
.
$q
.
dialog
({
title
:
"确定删除排班计划"
,
message
:
''
,
cancel
:
{
label
:
"取消"
,
flat
:
true
},
ok
:
{
label
:
"确认"
,
flat
:
true
,
focus
:
true
}
}).
onOk
(()
=>
{
let
msg
=
{
Id
:
Id
}
RemoveDutyPlan
(
msg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
this
.
$q
.
notify
({
icon
:
'iconfont icon-chenggong'
,
color
:
'accent'
,
timeout
:
2000
,
message
:
'操作成功'
,
position
:
'top'
})
this
.
getList
();
}
})
});
},
//分页改变
//分页改变
changePage
(
val
)
{
changePage
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
this
.
getList
();
},
},
//新增修改值班计划
EditSchedu
(
obj
)
{
if
(
obj
)
{
this
.
scheduOption
=
obj
;
}
else
{
this
.
scheduOption
=
null
;
}
this
.
isShowSchedu
=
true
;
},
//关闭新增修改弹窗
closeScheduForm
()
{
this
.
isShowSchedu
=
false
;
},
//刷新页面
refreshPage
()
{
if
(
!
this
.
scheduOption
)
{
this
.
msg
.
pageIndex
=
1
;
}
this
.
getList
()
},
getStatus
(
props
,
obj
)
{
// let beginDateStr = props + ' ' + obj.StartTime;
// let endDateStr = props + ' ' + obj.EndTime;
// let str = 0;
// let curDate = new Date();
// let beginDate = new Date(beginDateStr);
// let endDate = new Date(endDateStr);
// if (curDate
<
beginDate
)
{
// str = 1 //未开始
// }
// if (curDate >= beginDate && curDate
<=
endDate
)
{
// str = 2 //进行中
// }
// if (curDate > endDate) {
// str = 3 //已结束
// }
// return str;
}
},
},
}
}
...
...
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