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-manager-ui
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-manager-ui
Commits
55ef0705
Commit
55ef0705
authored
Aug 14, 2024
by
姬鋆屾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed:提交绩效汇总备注2最后一级删除数据无法覆盖的问题
parent
b32e612c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
9 deletions
+11
-9
src/assets/mixins/formdialog.js
src/assets/mixins/formdialog.js
+1
-1
src/views/staff/perform/summary/list.vue
src/views/staff/perform/summary/list.vue
+10
-8
No files found.
src/assets/mixins/formdialog.js
View file @
55ef0705
...
@@ -80,7 +80,7 @@ export default {
...
@@ -80,7 +80,7 @@ export default {
if
(
data
.
remarkAdd
&&
data
.
remarkAdd
.
length
>
0
)
{
if
(
data
.
remarkAdd
&&
data
.
remarkAdd
.
length
>
0
)
{
data
.
remarkAdd
=
JSON
.
stringify
(
data
.
remarkAdd
);
data
.
remarkAdd
=
JSON
.
stringify
(
data
.
remarkAdd
);
}
else
{
}
else
{
data
.
remarkAdd
=
"
--
"
;
data
.
remarkAdd
=
JSON
.
stringify
([{
name
:
""
,
score
:
0
}])
;
}
}
data
.
remark
==
"
迟到:0 次,
\n
早退:0 次,
\n
缺卡:0 次,
\n
请假:0 次
"
data
.
remark
==
"
迟到:0 次,
\n
早退:0 次,
\n
缺卡:0 次,
\n
请假:0 次
"
?
(
data
.
remark
=
""
)
?
(
data
.
remark
=
""
)
...
...
src/views/staff/perform/summary/list.vue
View file @
55ef0705
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
:show-close=
"false"
:show-close=
"false"
>
>
<div
class=
"fresh_box"
v-if=
"showContent"
>
<div
class=
"fresh_box"
v-if=
"showContent"
>
<div
class=
"title_box"
style=
"margin-bottom: 20px
;
"
>
<div
class=
"title_box"
style=
"margin-bottom: 20px"
>
仅支持手动更新月度绩效数据,请选择需要更新的月份:
仅支持手动更新月度绩效数据,请选择需要更新的月份:
</div>
</div>
<el-date-picker
<el-date-picker
...
@@ -60,19 +60,19 @@
...
@@ -60,19 +60,19 @@
<div
class=
"fresh_box"
v-else
>
<div
class=
"fresh_box"
v-else
>
<div
<div
class=
"title_box"
class=
"title_box"
style=
"margin-bottom: 20px;
line-height: 30px;
"
style=
"margin-bottom: 20px;
line-height: 30px
"
v-if=
"showTip"
v-if=
"showTip"
>
>
请确认是否开始进行
{{
freshDate
}}
的绩效数据重新汇总;此过程预计需要
请确认是否开始进行
{{
freshDate
}}
的绩效数据重新汇总;此过程预计需要
<span
style=
"color:
#ff0000 ;
"
>
15
</span>
分钟,请勿关闭或刷新页面
<span
style=
"color:
#ff0000
"
>
15
</span>
分钟,请勿关闭或刷新页面
</div>
</div>
<div
<div
class=
"title_box"
class=
"title_box"
style=
"margin-bottom: 20px;
line-height: 30px;
"
style=
"margin-bottom: 20px;
line-height: 30px
"
v-else
v-else
>
>
正在进行
{{
freshDate
}}
的绩效数据重新汇总;此过程预计还需要
正在进行
{{
freshDate
}}
的绩效数据重新汇总;此过程预计还需要
<span
style=
"color:
#ff0000 ;
"
>
{{
restTime
}}
</span>
<span
style=
"color:
#ff0000
"
>
{{
restTime
}}
</span>
分钟,请勿关闭或刷新页面
分钟,请勿关闭或刷新页面
</div>
</div>
</div>
</div>
...
@@ -140,7 +140,7 @@ export default {
...
@@ -140,7 +140,7 @@ export default {
}
else
{
}
else
{
this
.
percent
=
this
.
percent
+
1
;
this
.
percent
=
this
.
percent
+
1
;
let
that
=
this
;
let
that
=
this
;
setTimeout
(
function
()
{
setTimeout
(
function
()
{
that
.
countDown
();
that
.
countDown
();
},
200
);
},
200
);
}
}
...
@@ -293,7 +293,7 @@ export default {
...
@@ -293,7 +293,7 @@ export default {
this
.
getData
();
this
.
getData
();
return
;
return
;
}
}
setTimeout
(
function
()
{
setTimeout
(
function
()
{
that
.
countdown
();
that
.
countdown
();
},
1000
);
},
1000
);
}
}
...
@@ -636,7 +636,9 @@ export default {
...
@@ -636,7 +636,9 @@ export default {
label
:
"
备注2
"
,
label
:
"
备注2
"
,
prop
:
"
remarkAddDesc
"
,
prop
:
"
remarkAddDesc
"
,
formatter
:
(
row
)
=>
{
formatter
:
(
row
)
=>
{
return
row
.
remarkAddDesc
&&
row
.
remarkAddDesc
!=
""
?
(
return
row
.
remarkAddDesc
&&
row
.
remarkAddDesc
!=
""
&&
row
.
remarkAddDesc
!=
"
(0);
"
?
(
row
.
remarkAddDesc
row
.
remarkAddDesc
)
:
(
)
:
(
<
span
style
=
"
color:#409eff
"
>
添加备注
2
<
/span
>
<
span
style
=
"
color:#409eff
"
>
添加备注
2
<
/span
>
...
...
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