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
13a151b9
Commit
13a151b9
authored
May 27, 2021
by
sunchao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
薪资单对应保单详情
parent
111ca407
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
122 additions
and
29 deletions
+122
-29
src/app/common/detail-modal/detail-modal.component.html
+17
-2
src/app/common/detail-modal/detail-modal.component.scss
+13
-1
src/app/my/salary-detail/salary-detail.component.html
+8
-4
src/app/my/salary-detail/salary-detail.component.scss
+1
-1
src/app/my/salary-detail/salary-detail.component.ts
+2
-1
src/app/my/salary-first-year/salary-first-year.component.html
+19
-19
src/app/my/salary-first-year/salary-first-year.component.ts
+62
-1
No files found.
src/app/common/detail-modal/detail-modal.component.html
View file @
13a151b9
...
...
@@ -4,9 +4,18 @@
<div
class=
"detailBox"
*
ngIf=
"application===2"
>
<div
class=
"header"
>
<div></div>
<h5>
其他
应税
加扣款
</h5>
<h5>
其他加扣款
</h5>
<div
class=
"closeModal cursor"
(
click
)="
closeModal
()"
>
×
</div>
</div>
<div
class=
"totastContent"
>
<div
class=
"subtitle"
>
其它加扣款包括什么?可能包括如下收入:
</div>
<ul>
<li>
1. 季度销售加码奖金
</li>
<li>
2. 公司营销活动激励奖金
</li>
<li>
3. 银盾在线的保单销售佣金
</li>
<li>
4. 其它的可能收入或者扣款
</li>
</ul>
</div>
</div>
<!-- 其他应税项目模板-->
<!--个人所得税政策模板-->
...
...
@@ -17,6 +26,12 @@
<div
class=
"closeModal cursor"
(
click
)="
closeModal
()"
>
×
</div>
</div>
</div>
<div
class=
"detailBox"
*
ngIf=
"application===3"
>
<div
class=
"header"
>
<div></div>
<h5>
标题
</h5>
<div
class=
"closeModal cursor"
(
click
)="
closeModal
()"
>
×
</div>
</div>
</div>
</div>
<!--弹窗结束-->
src/app/common/detail-modal/detail-modal.component.scss
View file @
13a151b9
...
...
@@ -8,7 +8,7 @@
bottom
:
0
;
left
:
0
;
width
:
100%
;
height
:
70%
;
//
height: 70%;
background-color
:
#fff
;
overflow-y
:
scroll
;
animation
:
slowUp
.5s
ease
both
;
...
...
@@ -40,6 +40,18 @@
background-color
:
#dcdcdc
;
transform
:
scaleY
(
0
.5
);
}
.totastContent
{
padding
:
10px
;
.subtitle
{
font-size
:
16px
;
height
:
40px
;
line-height
:
40px
;
}
ul
li
{
height
:
35px
;
line-height
:
35px
;
}
}
h4
{
color
:
#ec2d37
;
font-weight
:
bold
;
...
...
src/app/my/salary-detail/salary-detail.component.html
View file @
13a151b9
...
...
@@ -79,7 +79,7 @@
<span
class=
"red"
>
{{onlineAward.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
</div>
<div
class=
"item"
>
<div
class=
"item"
style=
"margin-right: 14px;"
>
<div
class=
"title"
>
<span>
佣金合计(A+B+C)
</span>
<span
class=
"red"
>
{{totalCommission | number: "1.2-2"}}
</span>
...
...
@@ -87,16 +87,16 @@
</div>
</div>
<div
class=
"part"
>
<div
class=
"item"
>
<div
class=
"item"
style=
"margin-right: 14px;"
>
<div
class=
"title"
>
<span
>
代扣个人所得税/增值税/附加税(D)
</span>
<span
(
click
)="
otherTaxFlag =
true"
>
代扣个人所得税/增值税/附加税(D)
<span
class=
"iconfont icon-wenhao"
style=
"margin-top: 3px;color: #f8002e;margin-left: 3px;"
></span>
</span>
<span
class=
"red"
>
{{deduction | number: "1.2-2" }}
</span>
</div>
<a
style=
"color:#2c67a0;"
(
click
)="
lookTak
()"
>
点击查看个人所得税明细
</a>
</div>
</div>
<div
class=
"part"
>
<div
class=
"item"
>
<div
class=
"item"
style=
"margin-right: 14px;"
>
<div
class=
"title"
>
<span>
本期实领(A+B+C-D)
</span>
<span
class=
"red"
>
{{after_tax_comis | number: "1.2-2"}}
</span>
...
...
@@ -113,6 +113,10 @@
<ydlife-detail-modal
[
application
]="
2
"
(
closeDetailModal
)="
otherToastShow =
false"
></ydlife-detail-modal>
</div>
<div
*
ngIf=
"otherTaxFlag"
>
<ydlife-detail-modal
[
application
]="
3
"
(
closeDetailModal
)="
otherTaxFlag =
false"
></ydlife-detail-modal>
</div>
</div>
<div
class=
"mask"
*
ngIf=
"takFlag == true;"
></div>
<div
class=
"tax_mask"
*
ngIf=
"takFlag == true;"
>
...
...
src/app/my/salary-detail/salary-detail.component.scss
View file @
13a151b9
...
...
@@ -34,7 +34,7 @@
.part
{
margin-bottom
:
10px
;
background
:
#fff
;
padding
:
0
10px
;
padding
:
0
6px
0
10px
;
border-radius
:
8px
;
padding-bottom
:
10px
;
.item
{
...
...
src/app/my/salary-detail/salary-detail.component.ts
View file @
13a151b9
...
...
@@ -64,7 +64,8 @@ export class SalaryDetailComponent implements OnInit {
total_paid
:
number
;
//本期实领
after_tax_comis
:
number
;
//其他加扣款问号
otherTaxFlag
:
boolean
=
false
;
constructor
(
private
_toast
:
ToastService
,
public
lifeCommonService
:
LifeCommonService
,
private
activatedRoute
:
ActivatedRoute
,
private
router
:
Router
,
...
...
src/app/my/salary-first-year/salary-first-year.component.html
View file @
13a151b9
...
...
@@ -4,21 +4,21 @@
<div>
{{salaryName}}
</div>
</div>
<div
class=
"content_wrapper"
*
ngIf=
"type=='1'"
>
<div
class=
"policy_item"
>
<div
class=
"policy_item"
*
ngFor=
"let policyItem of policyList"
>
<div
class=
"icon_bolck"
><i
class=
"iconfont icon-money-more"
></i></div>
<div
class=
"line_item"
>
<div>
投保人姓名:
王五
</div>
<div>
保险公司:
复星
</div>
<div>
生效时间:
2021-03-07
</div>
<div>
保单号:
1234567
</div>
<div
*
ngIf=
"status"
>
保费:
</div>
<div
*
ngIf=
"status"
>
FYC:
</div>
<div
*
ngIf=
"status"
>
职阶率:
</div>
<div
*
ngIf=
"status"
>
体系:
</div>
<div
*
ngIf=
"status"
>
经纪人:
</div>
<div>
投保人姓名:
{{policyItem.Insurance_Cust}}
</div>
<div>
保险公司:
{{policyItem.Customer}}
</div>
<div>
生效时间:
{{policyItem.EffectiveDate}}
</div>
<div>
保单号:
{{policyItem.Policyno}}
</div>
<div
*
ngIf=
"status"
>
保费:
{{policyItem.YearPREMIUM | number: "1.2-2"}}
</div>
<div
*
ngIf=
"status"
>
FYC:
{{policyItem['FYC/RYC'] | number: "1.2-2"}}
</div>
<div
*
ngIf=
"status"
>
职阶率:
{{policyItem.Rate}}%
</div>
<div
*
ngIf=
"status"
>
体系:
{{policyItem.SaleSystem}}
</div>
<div
*
ngIf=
"status"
>
经纪人:
{{policyItem.Salestaff}}
</div>
</div>
<div
class=
"money"
(
click
)="
status =
!status"
>
¥
3,750.00
¥
{{policyItem.YearPREMIUM | number: "1.2-2"}}
<div
style=
"width: 15px;height: 15px;position: absolute;right: -20px;top: 8px;"
[
ngStyle
]="{'
transform
'
:
status
?
'
rotate
(
180deg
)'
:
'
rotate
(
0
)','
top
'
:status
?'
8px
'
:
'
0
'}"
>
<span
class=
"iconfont icon-xiangxia"
></span>
...
...
@@ -28,15 +28,15 @@
</div>
<div
class=
"content_wrapper"
*
ngIf=
"type=='2'"
>
<div
class=
"policy_item"
>
<div
class=
"policy_item"
*
ngFor=
"let systemItem of systemList"
>
<div
class=
"icon_bolck"
style=
"top: 28px;"
><i
class=
"iconfont icon-money-more"
></i></div>
<div
class=
"line_item"
>
<div>
体系名称:
财商姐
</div>
<div>
体系FYC/RYC:
1,800
</div>
<div>
佣金比率:
20
%
</div>
<div>
体系名称:
{{systemItem.SaleSystem}}
</div>
<div>
体系FYC/RYC:
{{systemItem.Commission | number: "1.2-2"}}
</div>
<div>
佣金比率:
{{systemItem.Rate}}
%
</div>
</div>
<div
class=
"money"
style=
"top: 30px;right: 10px;"
>
¥
1,800.00
¥
{{systemItem.Commission | number: "1.2-2"}}
</div>
</div>
</div>
...
...
@@ -45,12 +45,12 @@
<div
class=
"policy_item"
style=
"padding-bottom: 10px;"
>
<div
class=
"icon_bolck"
style=
"top: 14px;"
><i
class=
"iconfont icon-money-more"
></i></div>
<div
class=
"line_item"
>
<div>
{{
salaryName}}: 5.6
</div>
<div>
备注:
</div>
<div>
{{
remarkInfo?.CommissionName}}: {{remarkInfo?.Commission}}
</div>
<div>
备注:
{{remarkInfo?.Comments}}
</div>
</div>
<div
class=
"money"
style=
"top: 20px;right: 10px;"
>
¥
5.6
¥
{{remarkInfo?.Commission | number: "1.2-2"}}
</div>
</div>
</div>
...
...
src/app/my/salary-first-year/salary-first-year.component.ts
View file @
13a151b9
...
...
@@ -18,6 +18,14 @@ export class SalaryFirstYearComponent implements OnInit {
month
:
any
;
years
:
any
;
agent_id
:
any
;
//保单列表
policyList
:
Array
<
any
>
;
//体系列表
systemList
:
Array
<
any
>
;
//备注
remarkInfo
:
any
;
//其他加扣款列表
OtherCommissionList
:
Array
<
any
>
;
constructor
(
private
activatedRoute
:
ActivatedRoute
,
private
myService
:
MyService
)
{
}
ngOnInit
()
{
...
...
@@ -34,7 +42,23 @@ export class SalaryFirstYearComponent implements OnInit {
history
.
go
(
-
1
);
}
/**
* salaryTaype
* 1.首年度销售佣金-》保单
* 2.续年度销售佣金-》保单
* 3.首年度辅导奖金-》保单
* 4.续年度辅导奖金-》保单
* 5.首年度绩效奖金-》体系
* 6.续年度绩效奖金-》体系
* 7.推介奖金-》保单
* 8.体系推介奖金-》体系
* 9.特别管理奖金-》保单
* 10.其它税前加扣款-》备注
* 11.公司激励奖金-》备注
* 12.加码奖金-》备注
* 13.季度奖金-》备注
* 14.银盾在线佣金-》H5
*/
searchStaffSalaryDetails
(){
const
param
=
{
years
:
this
.
years
,
...
...
@@ -43,6 +67,43 @@ export class SalaryFirstYearComponent implements OnInit {
}
this
.
myService
.
searchStaffSalaryDetails
(
param
).
subscribe
((
res
)
=>
{
console
.
log
(
res
)
if
(
res
[
'data'
]){
if
(
this
.
salaryType
==
1
){
this
.
policyList
=
res
[
'data'
][
'FristYearCommissionList'
];
}
else
if
(
this
.
salaryType
==
2
){
this
.
policyList
=
res
[
'data'
][
'RenewalYearCommissionList'
];
}
else
if
(
this
.
salaryType
==
3
){
this
.
policyList
=
res
[
'data'
][
'FristYearCoachCommissionList'
];
}
else
if
(
this
.
salaryType
==
4
){
this
.
policyList
=
res
[
'data'
][
'RenewalYearCoachCommissionList'
];
}
else
if
(
this
.
salaryType
==
5
){
this
.
systemList
=
res
[
'data'
][
'FirstYearPerformanceCommissionList'
];
}
else
if
(
this
.
salaryType
==
6
){
this
.
systemList
=
res
[
'data'
][
'RenewalYearPerformanceCommissionList'
];
}
else
if
(
this
.
salaryType
==
7
){
this
.
policyList
=
res
[
'data'
][
'RecommendCommissionList'
];
}
else
if
(
this
.
salaryType
==
8
){
this
.
systemList
=
res
[
'data'
][
'RecommendSystemCommissionList'
];
}
else
if
(
this
.
salaryType
==
9
){
this
.
policyList
=
res
[
'data'
][
'SpecialManagementCommissionList'
];
}
else
{
this
.
OtherCommissionList
=
res
[
'data'
][
'OtherCommissionList'
];
for
(
let
i
=
0
;
i
<
this
.
OtherCommissionList
.
length
;
i
++
){
if
(
this
.
salaryType
==
10
&&
this
.
OtherCommissionList
[
i
][
'CommissionName'
]
==
'其它税前加扣款'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
11
&&
this
.
OtherCommissionList
[
i
][
'CommissionName'
]
==
'公司激励奖金'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
12
&&
this
.
OtherCommissionList
[
i
][
'CommissionName'
]
==
'加码奖金'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
13
&&
this
.
OtherCommissionList
[
i
][
'CommissionName'
]
==
'季度奖金'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
14
&&
this
.
OtherCommissionList
[
i
][
'CommissionName'
]
==
'银盾在线佣金'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
}
}
}
})
}
}
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