Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
ydLife
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Sweet Zhang
ydLife
Commits
0bd257a2
Commit
0bd257a2
authored
Jan 21, 2022
by
Sweet Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
历史薪资isHistory传1
parent
f7d43c34
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
src/app/my/e-notice/e-notice.component.ts
+0
-1
src/app/my/salary/salary.component.html
+4
-5
src/app/my/salary/salary.component.ts
+1
-1
No files found.
src/app/my/e-notice/e-notice.component.ts
View file @
0bd257a2
import
{
Component
,
OnInit
}
from
'@angular/core'
;
import
{
ActivatedRoute
}
from
"@angular/router"
;
import
{
Router
}
from
'@angular/router'
;
import
{
debug
}
from
'console'
;
import
{
MyService
}
from
'../my.service'
;
@
Component
({
...
...
src/app/my/salary/salary.component.html
View file @
0bd257a2
...
...
@@ -21,13 +21,13 @@
<div
class=
"price"
*
ngIf=
"!payScaleItem.pdfOssPath"
>
¥{{payScaleItem.monDtlRAmount | number: "1.2-2"}}
</div>
</div>
</div>
<div
class=
"iconfont icon-ar-r"
<div
class=
"iconfont icon-ar-r"
style=
"width: 20px;height: 20px;position: absolute;right: 2px;top: 23px;"
></div>
</div>
<div
style=
"text-align: center;margin-top: 20px;"
*
ngIf=
"payScaleInfos?.length<=0"
>
暂无数据
</div>
</div>
<div
id=
"salesContent"
*
ngIf=
"selectedId ==
2
"
>
<div
id=
"salesContent"
*
ngIf=
"selectedId ==
1
"
>
<div
*
ngIf=
"nowYear>2021"
>
<div
class=
"salesItem"
*
ngFor=
"let historyPartItem of historyPart2"
(
click
)="
enterDetail
(
historyPartItem
.
years
,
historyPartItem
.
month
,
historyPartItem
.
loginName
,
historyPartItem
.
isBasic
)"
>
<div
class=
"icon_bolck"
style=
"top: 16px;"
><span
class=
"iconfont icon-xinzidan"
></span></div>
...
...
@@ -41,7 +41,7 @@
<div
class=
"price"
>
¥{{historyPartItem.monDtlRAmount | number: "1.2-2"}}
</div>
</div>
</div>
<div
class=
"iconfont icon-ar-r"
<div
class=
"iconfont icon-ar-r"
style=
"width: 20px;height: 20px;position: absolute;right: 2px;top: 23px;"
></div>
</div>
</div>
...
...
@@ -79,4 +79,4 @@
</div>
<ydlife-toast
*
ngIf=
"toastDialog"
[
toastInfo
]="
toastInfo
"
></ydlife-toast>
\ No newline at end of file
<ydlife-toast
*
ngIf=
"toastDialog"
[
toastInfo
]="
toastInfo
"
></ydlife-toast>
src/app/my/salary/salary.component.ts
View file @
0bd257a2
...
...
@@ -33,7 +33,7 @@ export class SalaryComponent implements OnInit {
this
.
payScaleListQuery
();
this
.
tabList
=
[
{
name
:
`
${
this
.
nowYear
}
年`
,
id
:
0
},
{
name
:
'历史薪资'
,
id
:
2
}
{
name
:
'历史薪资'
,
id
:
1
}
]
}
...
...
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