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
76a9c86b
Commit
76a9c86b
authored
May 07, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
也没修过
parent
5be130d2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
60 additions
and
36 deletions
+60
-36
schedul-visit.vue
src/components/schedul/schedul-visit.vue
+35
-12
scheduleInfo.vue
src/pages/scheduling/scheduleInfo.vue
+25
-24
No files found.
src/components/schedul/schedul-visit.vue
View file @
76a9c86b
...
...
@@ -91,10 +91,12 @@
.schedulVisit
.q-table
tbody
td
:before
{
background
:
transparent
!important
;
}
.scheduVipop
.el-textarea__inner
{
background
:
#F0F2F5
!important
;
border
:
0
;
.scheduVipop
.el-textarea__inner
{
background
:
#F0F2F5
!important
;
border
:
0
;
}
</
style
>
<
template
>
<div
class=
"schedulVisit"
>
...
...
@@ -155,7 +157,7 @@
<q-btn
color=
"accent"
size=
"sm"
@
click=
"isShowVform=!isShowVform,SaveVisitor()"
style=
"float:right;margin-bottom:10px;"
label=
"保存"
/>
</div>
<q-btn
color=
"accent"
slot=
"reference"
size=
"sm"
icon=
"add"
@
click=
"clearAddMsg"
label=
"添加访客"
/>
<q-btn
color=
"accent"
slot=
"reference"
size=
"sm"
icon=
"add"
@
click=
"clearAddMsg"
label=
"添加访客"
v-if=
"DutyAuthObj.isShowAdd"
/>
</el-popover>
</div>
</
template
>
...
...
@@ -211,14 +213,15 @@
<el-input
v-model=
"addMsg.Evaluate"
placeholder=
"请输入意向评估"
maxlength=
"500"
></el-input>
</el-form-item>
<el-form-item
label=
"备注"
>
<el-input
type=
"textarea"
v-model=
"addMsg.Remark"
:rows=
"4"
placeholder=
"请输入备注"
maxlength=
"500"
></el-input>
<el-input
type=
"textarea"
v-model=
"addMsg.Remark"
:rows=
"4"
placeholder=
"请输入备注"
maxlength=
"500"
>
</el-input>
</el-form-item>
</el-form>
<q-btn
color=
"accent"
size=
"sm"
@
click=
"SaveVisitor()"
style=
"float:right;margin-bottom:10px;"
label=
"保存"
/>
</div>
<q-btn
flat
size=
"xs"
icon=
"edit"
slot=
"reference"
@
click=
"SetVisitor(props.row.Id)"
color=
"accent"
style=
"font-weight:400"
label=
"编辑"
/>
style=
"font-weight:400"
label=
"编辑"
v-if=
"DutyAuthObj.isShowEdit"
/>
</el-popover>
</q-td>
</
template
>
...
...
@@ -242,6 +245,10 @@
saveObj
:
{
type
:
Object
,
default
:
null
},
authObj
:
{
type
:
Object
,
default
:
null
}
},
data
()
{
...
...
@@ -339,9 +346,9 @@
StudyTime
:
""
,
//学习时间
LevelType
:
""
,
//当前水平
PlanId
:
0
,
//值班编号
VisitorStatus
:
1
,
//状态
Evaluate
:
''
,
//意向评估
Remark
:
''
//备注
VisitorStatus
:
1
,
//状态
Evaluate
:
''
,
//意向评估
Remark
:
''
//备注
},
statusMsg
:
{
Id
:
0
,
//编号
...
...
@@ -362,17 +369,33 @@
SearchKey
:
''
,
//搜索条件
isShowVform
:
false
,
isShowVedit
:
false
,
//权限显示对象
DutyAuthObj
:
{
isShowAdd
:
true
,
//是否显示新增按钮【默认显示】
isShowEdit
:
true
,
//是否显示编辑按钮【默认显示】
},
}
},
created
()
{
this
.
msg
.
PlanId
=
this
.
saveObj
.
Id
;
this
.
msg
.
PlanId
=
this
.
saveObj
.
Id
;
this
.
getGuestBasics
();
this
.
initAuth
()
},
mounted
()
{
this
.
getVisitoryPage
();
},
methods
:
{
//初始化权限信息
initAuth
()
{
if
(
this
.
authObj
)
{
if
(
this
.
authObj
.
isShowAdd
!=
null
&&
!
this
.
authObj
.
isShowAdd
)
{
this
.
DutyAuthObj
.
isShowAdd
=
this
.
authObj
.
isShowAdd
;
}
if
(
this
.
authObj
.
isShowEdit
!=
null
&&
!
this
.
authObj
.
isShowEdit
)
{
this
.
DutyAuthObj
.
isShowEdit
=
this
.
authObj
.
isShowEdit
;
}
}
},
//日语基础枚举
getGuestBasics
()
{
getGuestBasicsEnumList
({}).
then
(
res
=>
{
...
...
@@ -410,7 +433,7 @@
}).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
var
tempData
=
res
.
Data
;
console
.
log
(
tempData
,
'tempData'
);
console
.
log
(
tempData
,
'tempData'
);
if
(
tempData
)
{
this
.
addMsg
.
Id
=
tempData
.
Id
;
this
.
addMsg
.
Name
=
tempData
.
Name
;
...
...
src/pages/scheduling/scheduleInfo.vue
View file @
76a9c86b
<
style
>
.schedu
Main
{
.schedu
Info
{
height
:
100%
;
width
:
100%
;
padding
:
15px
;
...
...
@@ -7,7 +7,7 @@
overflow
:
hidden
;
}
.schedu
Main
.schedu_left
{
.schedu
Info
.schedu_left
{
width
:
248px
;
flex
:
0
0
auto
;
position
:
relative
;
...
...
@@ -17,7 +17,7 @@
height
:
100%
;
}
.schedu
Main
.okr-menu-active
{
.schedu
Info
.okr-menu-active
{
color
:
var
(
--q-color-primary
);
font-weight
:
bold
;
background
:
#ecf1ff
;
...
...
@@ -234,26 +234,17 @@
</
style
>
<
template
>
<div
class=
"schedu
Main
"
>
<div
class=
"schedu
Info
"
>
<div
class=
"flex row mySched"
>
<div
class=
"schedu_left"
>
<div
class=
"schedu_ImgDiv"
>
<img
:src=
"dataList.DutyManIcon"
alt=
""
/>
</div>
<div
class=
"schedu_Name"
>
{{
dataList
.
DutyManName
}}
</div>
<div
class=
"schedu_Status"
>
<span
class=
"schedu_st zbz"
></span>
{{
dataList
.
DutyStatusStr
}}
</div>
<div
class=
"clockon_Duty"
@
click=
"SetDutyCheck(1)"
v-if=
"dataList.DutyStatus==1 && dataList.Status==0 "
>
值班打卡
<i
class=
"iconfont icon-jiejue1 sche_daka"
></i>
</div>
<div
class=
"clockon_Duty"
@
click=
"SetDutyCheck(2)"
v-if=
"dataList.DutyStatus==1 && dataList.Status==1 "
>
值班交接
<i
class=
"iconfont icon-jiejue1 sche_daka"
></i>
</div>
</div>
<div
class=
"col scroll schScroll"
>
值班人员:
<img
v-if=
"dataList.DutyManIcon"
:src=
"dataList.DutyManIcon"
alt=
""
style=
"width:20px;height:20px;"
/>
{{
dataList
.
DutyManName
}}
<br
/>
值班状态:
{{
dataList
.
DutyStatusStr
}}
<br
/>
打卡时间
{{
dataList
.
CheckTime
}}
<br
/>
交接时间
{{
dataList
.
FinishTime
}}
<div
class=
"sche_rightTop"
>
<div
class=
"sche_Topflex"
>
<div
class=
"Sctop_Color Scdu_benci"
style=
"position:relative;"
>
本次值班信息
</div>
...
...
@@ -272,8 +263,8 @@
</div>
</div>
<div
class=
"Sche_Bottom"
>
<schedulOrder
:save-obj=
"msg"
@
refreshPage=
"refreshPage"
></schedulOrder>
<schedulVisit
:save-obj=
"msg"
></schedulVisit>
<schedulOrder
:save-obj=
"msg"
:authObj=
"workAuthObj"
@
refreshPage=
"refreshPage"
></schedulOrder>
<schedulVisit
:save-obj=
"msg"
:authObj=
"vitiorAuthObj"
></schedulVisit>
</div>
</div>
</div>
...
...
@@ -309,7 +300,17 @@
Shift
:
0
,
Status
:
0
,
//Status(1-值班打卡,2-交接打卡)
},
dataList
:
{}
dataList
:
{},
//是否显示访客操作按钮
vitiorAuthObj
:
{
isShowAdd
:
false
,
//是否显示新增按钮【默认不显示】
isShowEdit
:
false
,
//是否显示编辑按钮【默认不显示】
},
//是否显示工作内容相关按钮
workAuthObj
:
{
isShowAdd
:
false
,
//是否显示新增按钮【默认不显示】
isShowEditAndDelete
:
false
,
//是否显示编辑和删除按钮【默认不显示】
}
}
},
created
()
{
...
...
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