Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
44f4c6f2
Commit
44f4c6f2
authored
Jul 25, 2023
by
姬鋆屾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
推,修改提出的问题
parent
cc1cdaf7
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
794 additions
and
575 deletions
+794
-575
attendance-performance-manager-ui/admin/src/components/FormField.vue
...performance-manager-ui/admin/src/components/FormField.vue
+0
-1
attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue
...nce-manager-ui/admin/src/views/attendance/record/list.vue
+51
-23
attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
...mance-manager-ui/admin/src/views/attendance/stat/list.vue
+323
-287
attendance-performance-manager-ui/admin/src/views/feedback/list.vue
...-performance-manager-ui/admin/src/views/feedback/list.vue
+175
-126
attendance-performance-manager-ui/admin/src/views/staff/dialogshow.vue
...rformance-manager-ui/admin/src/views/staff/dialogshow.vue
+238
-136
attendance-performance-manager-ui/admin/src/views/staff/list.vue
...nce-performance-manager-ui/admin/src/views/staff/list.vue
+7
-2
No files found.
attendance-performance-manager-ui/admin/src/components/FormField.vue
View file @
44f4c6f2
...
...
@@ -226,7 +226,6 @@ export default {
},
maxLength
:
{
type
:
Number
,
default
:
256
,
},
},
methods
:
{
...
...
attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue
View file @
44f4c6f2
<
template
>
<div
class=
"page"
>
<div
>
<div>
<tab-pane
:thirdList=
"thirdList"
:activeName=
"activeName"
...
...
@@ -66,14 +66,14 @@
@
click=
"lookexportHis"
>
导出记录
</el-button
>
<
!--
<
el-button
<el-button
slot=
"table-head-left2"
style=
"margin-left: 10px"
icon=
"el-icon-tickets"
size=
"mini"
@
click=
"setdialog"
>
表格设置
</el-button
>
-->
>
</LayoutTable>
<drawer-show
ref=
"drawerform"
@
ok=
"getData"
/>
<!-- 导出记录查看 -->
...
...
@@ -189,7 +189,7 @@ import drawerShow from "./drawershow";
import
table
from
"
@/assets/mixins/table
"
;
import
TabPane
from
"
@/components/tabPane.vue
"
;
import
{
timestampToTime
}
from
"
@/assets/utils/dateFormat
"
;
import
{
formatterDateOnly
}
from
"
@/assets/utils/table
"
;
import
{
formatterDateOnly
}
from
"
@/assets/utils/table
"
;
export
default
{
name
:
"
AttendanceRecordList
"
,
components
:
{
...
...
@@ -401,12 +401,30 @@ export default {
/** 子表列元素 */
columnSet
:
[
{
prop
:
"
shiftsName
"
,
label
:
"
班次名称
"
,
width
:
150
},
{
prop
:
"
goWorkDate
"
,
label
:
"
上班打卡时间
"
,
width
:
100
,
formatter
:
this
.
formatterDate
},
{
prop
:
"
goWorkResult
"
,
label
:
"
上班打卡结果
"
,
width
:
100
,
formatter
:
this
.
formatterString
},
{
prop
:
"
offWorkDate
"
,
label
:
"
下班打卡时间
"
,
width
:
100
,
formatter
:
this
.
formatterDate
},
{
prop
:
"
offWorkResult
"
,
label
:
"
下班打卡结果
"
,
width
:
100
,
formatter
:
this
.
formatterString
}
{
prop
:
"
goWorkDate
"
,
label
:
"
上班打卡时间
"
,
width
:
100
,
formatter
:
this
.
formatterDate
,
},
{
prop
:
"
goWorkResult
"
,
label
:
"
上班打卡结果
"
,
width
:
100
,
formatter
:
this
.
formatterString
,
},
{
prop
:
"
offWorkDate
"
,
label
:
"
下班打卡时间
"
,
width
:
100
,
formatter
:
this
.
formatterDate
,
},
{
prop
:
"
offWorkResult
"
,
label
:
"
下班打卡结果
"
,
width
:
100
,
formatter
:
this
.
formatterString
,
},
],
config
:
{
search
:
[
...
...
@@ -459,7 +477,6 @@ export default {
label
:
"
考勤结束时间
"
,
fuzzy
:
false
,
},
],
columns
:
[
{
type
:
"
selection
"
,
width
:
60
},
...
...
@@ -479,24 +496,35 @@ export default {
{
label
:
"
部门
"
,
prop
:
"
deptName
"
,
formatter
:
this
.
formatters
},
{
label
:
"
职位
"
,
prop
:
"
positionName
"
,
formatter
:
this
.
formatters
},
{
label
:
"
班次
"
,
prop
:
"
shiftsName
"
,
formatter
:
this
.
formatters
},
{
label
:
"
签到结果
"
,
prop
:
"
signInResult
"
,
formatter
:
this
.
formatter
},
{
label
:
"
签退结果
"
,
prop
:
"
signOutResult
"
,
formatter
:
this
.
formatter
},
{
label
:
"
签到结果
"
,
prop
:
"
signInResult
"
,
formatter
:
this
.
formatter
,
},
{
label
:
"
签退结果
"
,
prop
:
"
signOutResult
"
,
formatter
:
this
.
formatter
,
},
{
label
:
"
打卡结果
"
,
prop
:
"
punchResult
"
,
formatter
:
this
.
formatter
},
{
label
:
"
考勤类型
"
,
prop
:
"
attendType
"
,
formatter
:
this
.
formatter
},
{
label
:
"
考勤打卡记录详细信息
"
,
{
label
:
"
考勤打卡记录详细信息
"
,
width
:
120
,
prop
:
"
subColumns
"
,
formatter
:
(
row
)
=>
{
let
widthsize
=
this
.
columnSet
.
reduce
((
pre
,
cur
)
=>
{
return
pre
+
Number
(
cur
.
width
);
},
50
);
return
(
<
el
-
popover
placement
=
"
right
"
width
=
{
widthsize
}
trigger
=
"
click
"
>
{
this
.
renderTable
(
row
.
attendanceRecordDetailList
)}
<
el
-
button
type
=
"
text
"
slot
=
"
reference
"
>
详细
<
/el-button
>
<
/el-popover
>
);
let
widthsize
=
this
.
columnSet
.
reduce
((
pre
,
cur
)
=>
{
return
pre
+
Number
(
cur
.
width
);
},
50
);
return
(
<
el
-
popover
placement
=
"
right
"
width
=
{
widthsize
}
trigger
=
"
click
"
>
{
this
.
renderTable
(
row
.
attendanceRecordDetailList
)}
<
el
-
button
type
=
"
text
"
slot
=
"
reference
"
>
详细
<
/el-button
>
<
/el-popover
>
);
},
},
// {
...
...
attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
View file @
44f4c6f2
This diff is collapsed.
Click to expand it.
attendance-performance-manager-ui/admin/src/views/feedback/list.vue
View file @
44f4c6f2
This diff is collapsed.
Click to expand it.
attendance-performance-manager-ui/admin/src/views/staff/dialogshow.vue
View file @
44f4c6f2
This diff is collapsed.
Click to expand it.
attendance-performance-manager-ui/admin/src/views/staff/list.vue
View file @
44f4c6f2
...
...
@@ -183,7 +183,12 @@
</div>
</el-dialog>
<drawer-show
ref=
"drawerform"
@
ok=
"getData"
:bumentree=
"areaData"
:currentNode=
"currentNode"
/>
<drawer-show
ref=
"drawerform"
@
ok=
"getData"
:bumentree=
"areaData"
:currentNode=
"currentNode"
/>
</div>
</
template
>
...
...
@@ -249,7 +254,7 @@ export default {
},
handleNodeClick
(
node
)
{
console
.
log
(
node
,
123123
);
console
.
log
(
node
,
123123
);
this
.
currentNode
=
node
;
this
.
query
=
{
deptId
:
node
.
id
};
this
.
getData
();
...
...
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