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
9f3000ba
Commit
9f3000ba
authored
2 months ago
by
姬鋆屾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed:修改测试后所提问题及样式修改
parent
629c6a1c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
8 deletions
+24
-8
src/components/SearchForm.vue
src/components/SearchForm.vue
+12
-6
src/views/window/perform/summary/list.vue
src/views/window/perform/summary/list.vue
+12
-2
No files found.
src/components/SearchForm.vue
View file @
9f3000ba
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
v-bind:class=
"
{ search_new_line: item.newLine }"
v-bind:class=
"
{ search_new_line: item.newLine }"
>
>
<el-input
<el-input
class=
"input_el"
v-model=
"form[item.name]"
v-model=
"form[item.name]"
v-if=
"item.type === 'text'"
v-if=
"item.type === 'text'"
:placeholder=
"
:placeholder=
"
...
@@ -276,7 +277,7 @@ export default {
...
@@ -276,7 +277,7 @@ export default {
this
.
$route
.
name
==
"
staff/perform/summary/list
"
||
this
.
$route
.
name
==
"
staff/perform/summary/list
"
||
this
.
$route
.
name
==
"
attendance/record/list
"
||
this
.
$route
.
name
==
"
attendance/record/list
"
||
this
.
$route
.
name
==
"
attendance/record/error/list
"
||
this
.
$route
.
name
==
"
attendance/record/error/list
"
||
this
.
$route
.
name
==
"
attendance/leave/record/list
"
||
this
.
$route
.
name
==
"
attendance/leave/record/list
"
||
this
.
$route
.
name
==
"
attendance/vacation/balance/list
"
this
.
$route
.
name
==
"
attendance/vacation/balance/list
"
)
{
)
{
this
.
getArr
();
this
.
getArr
();
...
@@ -474,6 +475,15 @@ export default {
...
@@ -474,6 +475,15 @@ export default {
delete
this
.
$route
.
query
.
orderColList
;
delete
this
.
$route
.
query
.
orderColList
;
this
.
form
=
Object
.
assign
({},
this
.
form
,
newData
);
this
.
form
=
Object
.
assign
({},
this
.
form
,
newData
);
if
(
this
.
$route
.
name
==
"
check/window/workman/perform/detail/list
"
||
this
.
$route
.
name
==
"
window/perform/summary/list
"
)
{
this
.
form
.
yearmonth
=
timestampToTime
(
new
Date
(),
2
);
this
.
form
.
year
=
timestampToTime
(
new
Date
(),
2
).
slice
(
0
,
4
);
this
.
form
.
month
=
timestampToTime
(
new
Date
(),
2
).
slice
(
5
);
}
this
.
form
.
idList
=
[];
this
.
onSubmit
();
this
.
onSubmit
();
},
},
onSubmit
()
{
onSubmit
()
{
...
@@ -599,11 +609,7 @@ export default {
...
@@ -599,11 +609,7 @@ export default {
query
.
errorTimeEnd
=
undefined
;
query
.
errorTimeEnd
=
undefined
;
}
}
}
}
if
(
this
.
$route
.
name
==
"
check/window/workman/perform/detail/list
"
)
{
query
.
yearmonth
=
timestampToTime
(
new
Date
(),
2
);
query
.
year
=
timestampToTime
(
new
Date
(),
2
).
slice
(
0
,
4
);
query
.
month
=
timestampToTime
(
new
Date
(),
2
).
slice
(
5
);
}
console
.
log
({
console
.
log
({
...
query
,
...
query
,
...
data
,
...
data
,
...
...
This diff is collapsed.
Click to expand it.
src/views/window/perform/summary/list.vue
View file @
9f3000ba
...
@@ -110,7 +110,12 @@ export default {
...
@@ -110,7 +110,12 @@ export default {
},
},
mixins
:
[
table
],
mixins
:
[
table
],
created
()
{},
created
()
{
this
.
query
.
yearmonth
=
timestampToTime
(
new
Date
(),
2
);
this
.
query
.
year
=
timestampToTime
(
new
Date
(),
2
).
substr
(
0
,
4
);
this
.
query
.
month
=
timestampToTime
(
new
Date
(),
2
).
substr
(
5
);
console
.
log
(
this
.
query
);
},
methods
:
{
methods
:
{
countDown
()
{
countDown
()
{
...
@@ -258,7 +263,6 @@ export default {
...
@@ -258,7 +263,6 @@ export default {
await
this
.
$post
(
"
/window/perform/summary/save
"
,
obj
).
then
((
res
)
=>
{
await
this
.
$post
(
"
/window/perform/summary/save
"
,
obj
).
then
((
res
)
=>
{
const
{
code
,
msg
}
=
res
;
const
{
code
,
msg
}
=
res
;
code
==
1
?
this
.
$message
.
success
(
msg
)
:
this
.
$message
.
error
(
msg
);
code
==
1
?
this
.
$message
.
success
(
msg
)
:
this
.
$message
.
error
(
msg
);
this
.
getData
();
});
});
},
},
},
},
...
@@ -364,6 +368,9 @@ export default {
...
@@ -364,6 +368,9 @@ export default {
label
:
"
合计得分
"
,
label
:
"
合计得分
"
,
prop
:
"
sumScore
"
,
prop
:
"
sumScore
"
,
sortable
:
true
,
sortable
:
true
,
formatter
:
(
row
)
=>
{
return
row
.
ckjsdf
+
row
.
zdrwdf
+
row
.
addTotalScore
;
},
},
},
{
{
label
:
"
评选建议
"
,
label
:
"
评选建议
"
,
...
@@ -438,6 +445,9 @@ export default {
...
@@ -438,6 +445,9 @@ export default {
overflow: hidden;
overflow: hidden;
top: -50px;
top: -50px;
}
}
/deep/.search-form-wapper .input_el {
width: 220px !important;
}
.freshTime {
.freshTime {
color: #999;
color: #999;
font-size: 14px;
font-size: 14px;
...
...
This diff is collapsed.
Click to expand it.
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