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
eb5410a2
Commit
eb5410a2
authored
Dec 23, 2021
by
sunchao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
佣奖类型添加其他&团队长辅导津贴显示
parent
75a500af
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
src/app/my/salary-detail/salary-detail.component.html
+5
-1
src/app/my/salary-detail/salary-detail.component.ts
+4
-0
src/app/my/salary-first-year/salary-first-year.component.ts
+1
-1
No files found.
src/app/my/salary-detail/salary-detail.component.html
View file @
eb5410a2
...
@@ -77,7 +77,7 @@
...
@@ -77,7 +77,7 @@
<span>
隔代辅导岗位津贴
</span>
<span>
隔代辅导岗位津贴
</span>
<span
class=
"red"
>
{{indirectCounseling.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
<span
class=
"red"
>
{{indirectCounseling.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
TLCoachingAllowance
,'团队长辅导津贴',
2
,
6
)"
*
ngIf=
"
indirectCounseling
"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
TLCoachingAllowance
,'团队长辅导津贴',
2
,
6
)"
*
ngIf=
"
TLCoachingAllowance
"
>
<span>
团队长辅导津贴
</span>
<span>
团队长辅导津贴
</span>
<span
class=
"red"
>
{{TLCoachingAllowance.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
<span
class=
"red"
>
{{TLCoachingAllowance.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
</div>
...
@@ -98,6 +98,10 @@
...
@@ -98,6 +98,10 @@
<span>
其它税前加扣款
</span>
<span>
其它税前加扣款
</span>
<span
class=
"red"
>
{{otherPreTaxDeduction.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
<span
class=
"red"
>
{{otherPreTaxDeduction.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
other
,'其他',
3
,
10
)"
*
ngIf=
"other"
>
<span>
其它
</span>
<span
class=
"red"
>
{{other.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
addWeight
,'加码奖金',
3
,
12
)"
*
ngIf=
"addWeight"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
addWeight
,'加码奖金',
3
,
12
)"
*
ngIf=
"addWeight"
>
<span>
加码奖金
</span>
<span>
加码奖金
</span>
<span
class=
"red"
>
{{addWeight.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
<span
class=
"red"
>
{{addWeight.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
...
...
src/app/my/salary-detail/salary-detail.component.ts
View file @
eb5410a2
...
@@ -59,6 +59,8 @@ export class SalaryDetailComponent implements OnInit {
...
@@ -59,6 +59,8 @@ export class SalaryDetailComponent implements OnInit {
TLCoachingAllowance
:
any
=
null
;
TLCoachingAllowance
:
any
=
null
;
//续年度销售加码奖金
//续年度销售加码奖金
continuedAnnualSalesBonus
:
any
=
null
;
continuedAnnualSalesBonus
:
any
=
null
;
//其他
other
:
any
=
null
;
years
:
any
;
years
:
any
;
month
:
any
;
month
:
any
;
agent_id
:
any
;
agent_id
:
any
;
...
@@ -222,6 +224,8 @@ export class SalaryDetailComponent implements OnInit {
...
@@ -222,6 +224,8 @@ export class SalaryDetailComponent implements OnInit {
this
.
quarterlyBonus
=
this
.
salaryDetailsList
[
i
];
this
.
quarterlyBonus
=
this
.
salaryDetailsList
[
i
];
}
else
if
(
this
.
salaryDetailsList
[
i
][
'project_id'
]
===
'12C24EDF-83D7-081C-AE2C-085031C4DCAF'
||
this
.
salaryDetailsList
[
i
][
'salaryCode'
]
===
'C-005'
){
}
else
if
(
this
.
salaryDetailsList
[
i
][
'project_id'
]
===
'12C24EDF-83D7-081C-AE2C-085031C4DCAF'
||
this
.
salaryDetailsList
[
i
][
'salaryCode'
]
===
'C-005'
){
this
.
onlineAward
=
this
.
salaryDetailsList
[
i
];
this
.
onlineAward
=
this
.
salaryDetailsList
[
i
];
}
else
if
(
this
.
salaryDetailsList
[
i
][
'salaryCode'
]
===
'C-006'
){
this
.
other
=
this
.
salaryDetailsList
[
i
];
}
else
{
}
else
{
break
;
break
;
}
}
...
...
src/app/my/salary-first-year/salary-first-year.component.ts
View file @
eb5410a2
...
@@ -57,7 +57,7 @@ export class SalaryFirstYearComponent implements OnInit {
...
@@ -57,7 +57,7 @@ export class SalaryFirstYearComponent implements OnInit {
* 7.推介奖金-》保单
* 7.推介奖金-》保单
* 8.体系推介奖金-》体系
* 8.体系推介奖金-》体系
* 9.特别管理奖金-》保单
* 9.特别管理奖金-》保单
* 10.其它税前加扣款-》备注
* 10.其它税前加扣款
/其他
-》备注
* 11.公司激励奖金-》备注
* 11.公司激励奖金-》备注
* 12.加码奖金-》备注
* 12.加码奖金-》备注
* 13.季度奖金-》备注
* 13.季度奖金-》备注
...
...
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