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
15a8db61
Commit
15a8db61
authored
Dec 31, 2021
by
sunchao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
保单信息职级率去掉&薪资单列表添加isActive入参
parent
a199fe7f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
src/app/my/salary-detail/salary-detail.component.ts
+1
-1
src/app/my/salary-first-year/salary-first-year.component.html
+2
-2
src/app/my/salary/salary.component.ts
+1
-1
No files found.
src/app/my/salary-detail/salary-detail.component.ts
View file @
15a8db61
...
...
@@ -289,7 +289,7 @@ export class SalaryDetailComponent implements OnInit {
//薪资单列表-》用来判断上一期下一期的加减
payScaleListQuery
()
{
this
.
myService
.
payScaleListQuery
({
practitionerId
:
this
.
practitionerId
,
isHistory
:
2
}).
subscribe
((
res
)
=>
{
this
.
myService
.
payScaleListQuery
({
practitionerId
:
this
.
practitionerId
,
isHistory
:
2
,
isActive
:
this
.
isPreSalary
?
null
:
1
}).
subscribe
((
res
)
=>
{
if
(
res
[
'success'
])
{
this
.
payScaleInfos
=
res
[
'data'
][
'payScaleInfos'
];
}
...
...
src/app/my/salary-first-year/salary-first-year.component.html
View file @
15a8db61
...
...
@@ -14,7 +14,7 @@
<div
*
ngIf=
"policyItem.status"
>
保费:{{policyItem.YearPREMIUM | number: "1.2-2"}}
</div>
<div
*
ngIf=
"policyItem.status"
>
FYC/RYC:{{policyItem['FYC/RYC'] | number: "1.2-2"}}
</div>
<
div
*
ngIf=
"policyItem.status"
>
职阶率:{{policyItem.Rate}}%
</div
>
<
!-- <div *ngIf="policyItem.status">职阶率:{{policyItem.Rate}}%</div> --
>
<div
*
ngIf=
"policyItem.status"
>
体系:{{policyItem.SaleSystem}}
</div>
<div
*
ngIf=
"policyItem.status"
>
经纪人:{{policyItem.Salestaff}}
</div>
</div>
...
...
@@ -34,7 +34,7 @@
<div
class=
"line_item"
>
<div>
体系名称:{{systemItem.SaleSystem}}
</div>
<div>
体系FYC/RYC:{{systemItem['FYC/RYC'] | number: "1.2-2"}}
</div>
<div>
佣
金比率
:{{systemItem.Rate}}%
</div>
<div>
佣
奖比例
:{{systemItem.Rate}}%
</div>
</div>
<div
class=
"money"
style=
"top: 30px;right: 10px;"
*
ngIf=
"isBasic==0"
>
¥{{(systemItem['FYC/RYC']) * (systemItem.Rate/100 ) | number: "1.2-2"}}
...
...
src/app/my/salary/salary.component.ts
View file @
15a8db61
...
...
@@ -38,7 +38,7 @@ export class SalaryComponent implements OnInit {
}
payScaleListQuery
()
{
this
.
myService
.
payScaleListQuery
({
practitionerId
:
this
.
practitionerId
,
isHistory
:
this
.
selectedId
}).
subscribe
((
res
)
=>
{
this
.
myService
.
payScaleListQuery
({
practitionerId
:
this
.
practitionerId
,
isHistory
:
this
.
selectedId
,
isActive
:
1
}).
subscribe
((
res
)
=>
{
if
(
res
[
'success'
])
{
if
(
this
.
selectedId
==
0
){
if
(
this
.
nowYear
==
2021
){
...
...
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