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
e1534c2a
Commit
e1534c2a
authored
May 28, 2021
by
sunchao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
薪资单详情页面取值修改
parent
5f1593e4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
18 deletions
+23
-18
src/app/my/salary-detail/salary-detail.component.html
+1
-1
src/app/my/salary-detail/salary-detail.component.scss
+1
-1
src/app/my/salary-first-year/salary-first-year.component.html
+11
-11
src/app/my/salary-first-year/salary-first-year.component.ts
+10
-5
No files found.
src/app/my/salary-detail/salary-detail.component.html
View file @
e1534c2a
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<div
class=
"salay"
>
¥{{after_tax_comis | number: "1.2-2"}}
</div>
<div
class=
"salay"
>
¥{{after_tax_comis | number: "1.2-2"}}
</div>
<div
class=
"next"
(
click
)="
querySalaryDetail
('
next
')"
>
下一期
<span
class=
"iconfont icon-ar-r"
></span></div>
<div
class=
"next"
(
click
)="
querySalaryDetail
('
next
')"
>
下一期
<span
class=
"iconfont icon-ar-r"
></span></div>
</div>
</div>
<p><span
class=
"cash"
>
{{month}}月佣金
</span></p>
<p><span
class=
"cash"
>
{{
years}}年{{
month}}月佣金
</span></p>
</div>
</div>
</div>
</div>
<div
class=
"content_wrapper"
>
<div
class=
"content_wrapper"
>
...
...
src/app/my/salary-detail/salary-detail.component.scss
View file @
e1534c2a
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
text-align
:
center
;
text-align
:
center
;
margin-top
:
15px
;
margin-top
:
15px
;
.cash
{
.cash
{
width
:
8
5px
;
width
:
11
5px
;
height
:
32px
;
height
:
32px
;
line-height
:
30px
;
line-height
:
30px
;
border
:
2px
solid
#f9fdff
;
border
:
2px
solid
#f9fdff
;
...
...
src/app/my/salary-first-year/salary-first-year.component.html
View file @
e1534c2a
...
@@ -8,19 +8,19 @@
...
@@ -8,19 +8,19 @@
<div
class=
"icon_bolck"
><i
class=
"iconfont icon-money-more"
></i></div>
<div
class=
"icon_bolck"
><i
class=
"iconfont icon-money-more"
></i></div>
<div
class=
"line_item"
>
<div
class=
"line_item"
>
<div>
投保人姓名:{{policyItem.Insurance_Cust}}
</div>
<div>
投保人姓名:{{policyItem.Insurance_Cust}}
</div>
<div>
保险公司:{{policyItem.Customer}}
</div>
<div>
保险公司:{{policyItem.Customer
.substr(0,8)
}}
</div>
<div>
生效时间:{{policyItem.EffectiveDate}}
</div>
<div>
生效时间:{{policyItem.EffectiveDate}}
</div>
<div>
保单号:{{policyItem.Policyno}}
</div>
<div>
保单号:{{policyItem.Policyno}}
</div>
<div
*
ngIf=
"status"
>
保费:{{policyItem.YearPREMIUM | number: "1.2-2"}}
</div>
<div
*
ngIf=
"
policyItem.
status"
>
保费:{{policyItem.YearPREMIUM | number: "1.2-2"}}
</div>
<div
*
ngIf=
"
status"
>
F
YC:{{policyItem['FYC/RYC'] | number: "1.2-2"}}
</div>
<div
*
ngIf=
"
policyItem.status"
>
FYC/R
YC:{{policyItem['FYC/RYC'] | number: "1.2-2"}}
</div>
<div
*
ngIf=
"status"
>
职阶率:{{policyItem.Rate}}%
</div>
<div
*
ngIf=
"
policyItem.
status"
>
职阶率:{{policyItem.Rate}}%
</div>
<div
*
ngIf=
"status"
>
体系:{{policyItem.SaleSystem}}
</div>
<div
*
ngIf=
"
policyItem.
status"
>
体系:{{policyItem.SaleSystem}}
</div>
<div
*
ngIf=
"status"
>
经纪人:{{policyItem.Salestaff}}
</div>
<div
*
ngIf=
"
policyItem.
status"
>
经纪人:{{policyItem.Salestaff}}
</div>
</div>
</div>
<div
class=
"money"
(
click
)="
s
tatus =
!status
"
>
<div
class=
"money"
(
click
)="
s
hrink
(
policyItem
)
"
>
¥{{policyItem.YearPREMIUM | number: "1.2-2"}}
¥{{policyItem.YearPREMIUM | number: "1.2-2"}}
<div
style=
"width: 15px;height: 15px;position: absolute;right: -20px;top: 8px;"
<div
style=
"width: 15px;height: 15px;position: absolute;right: -20px;top: 8px;"
[
ngStyle
]="{'
transform
'
:
status
?
'
rotate
(
180deg
)'
:
'
rotate
(
0
)','
top
'
:
status
?'
8px
'
:
'
0
'}"
>
[
ngStyle
]="{'
transform
'
:
policyItem
.
status
?
'
rotate
(
180deg
)'
:
'
rotate
(
0
)','
top
'
:policyItem
.
status
?'
8px
'
:
'
0
'}"
>
<span
class=
"iconfont icon-xiangxia"
></span>
<span
class=
"iconfont icon-xiangxia"
></span>
</div>
</div>
</div>
</div>
...
@@ -32,11 +32,11 @@
...
@@ -32,11 +32,11 @@
<div
class=
"icon_bolck"
style=
"top: 28px;"
><i
class=
"iconfont icon-money-more"
></i></div>
<div
class=
"icon_bolck"
style=
"top: 28px;"
><i
class=
"iconfont icon-money-more"
></i></div>
<div
class=
"line_item"
>
<div
class=
"line_item"
>
<div>
体系名称:{{systemItem.SaleSystem}}
</div>
<div>
体系名称:{{systemItem.SaleSystem}}
</div>
<div>
体系FYC/RYC:{{systemItem
.Commission
| number: "1.2-2"}}
</div>
<div>
体系FYC/RYC:{{systemItem
['FYC/RYC']
| number: "1.2-2"}}
</div>
<div>
佣金比率:{{systemItem.Rate}}%
</div>
<div>
佣金比率:{{systemItem.Rate}}%
</div>
</div>
</div>
<div
class=
"money"
style=
"top: 30px;right: 10px;"
>
<div
class=
"money"
style=
"top: 30px;right: 10px;"
>
¥{{systemItem
.Commission
| number: "1.2-2"}}
¥{{systemItem
['FYC/RYC']
| number: "1.2-2"}}
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
<div
class=
"policy_item"
style=
"padding-bottom: 10px;"
>
<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=
"icon_bolck"
style=
"top: 14px;"
><i
class=
"iconfont icon-money-more"
></i></div>
<div
class=
"line_item"
>
<div
class=
"line_item"
>
<div>
{{remarkInfo?.CommissionName}}: {{remarkInfo?.Commission}}
</div>
<div>
{{remarkInfo?.CommissionName}}: {{remarkInfo?.Commission
| number: "1.2-2"
}}
</div>
<div>
备注:{{remarkInfo?.Comments}}
</div>
<div>
备注:{{remarkInfo?.Comments}}
</div>
</div>
</div>
...
...
src/app/my/salary-first-year/salary-first-year.component.ts
View file @
e1534c2a
...
@@ -91,15 +91,16 @@ export class SalaryFirstYearComponent implements OnInit {
...
@@ -91,15 +91,16 @@ export class SalaryFirstYearComponent implements OnInit {
}
else
{
}
else
{
this
.
OtherCommissionList
=
res
[
'data'
][
'OtherCommissionList'
];
this
.
OtherCommissionList
=
res
[
'data'
][
'OtherCommissionList'
];
for
(
let
i
=
0
;
i
<
this
.
OtherCommissionList
.
length
;
i
++
){
for
(
let
i
=
0
;
i
<
this
.
OtherCommissionList
.
length
;
i
++
){
if
(
this
.
salaryType
==
10
&&
this
.
OtherCommissionList
[
i
][
'
CommissionName'
]
==
'其它税前加扣款
'
){
if
(
this
.
salaryType
==
10
&&
this
.
OtherCommissionList
[
i
][
'
Project_Id'
]
==
'91E8A0DD-8696-9964-CD35-AEBA6C8FDF19
'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
11
&&
this
.
OtherCommissionList
[
i
][
'
CommissionName'
]
==
'公司激励奖金
'
){
}
else
if
(
this
.
salaryType
==
11
&&
this
.
OtherCommissionList
[
i
][
'
Project_Id'
]
==
'45C0E205-653A-641B-1A35-C5C4148B1DA6
'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
12
&&
this
.
OtherCommissionList
[
i
][
'
CommissionName'
]
==
'加码奖金
'
){
}
else
if
(
this
.
salaryType
==
12
&&
this
.
OtherCommissionList
[
i
][
'
Project_Id'
]
==
'FC664684-4CBB-E3EC-FEC4-02FDDCAB4A02
'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
13
&&
this
.
OtherCommissionList
[
i
][
'
CommissionName'
]
==
'季度奖金
'
){
}
else
if
(
this
.
salaryType
==
13
&&
this
.
OtherCommissionList
[
i
][
'
Project_Id'
]
==
'105B9197-7B64-5AE6-AC47-C15AA857DDC5
'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
14
&&
this
.
OtherCommissionList
[
i
][
'CommissionName'
]
==
'银盾在线佣金'
){
}
else
if
(
this
.
salaryType
==
14
&&
this
.
OtherCommissionList
[
i
][
'Project_Id'
]
==
'12C24EDF-83D7-081C-AE2C-085031C4DCAF'
){
//银盾在线佣金
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
this
.
withdrawId
=
this
.
OtherCommissionList
[
i
][
'withdrawedId'
];
this
.
withdrawId
=
this
.
OtherCommissionList
[
i
][
'withdrawedId'
];
this
.
fortuneWithdrawListQuery
()
this
.
fortuneWithdrawListQuery
()
...
@@ -127,4 +128,8 @@ export class SalaryFirstYearComponent implements OnInit {
...
@@ -127,4 +128,8 @@ export class SalaryFirstYearComponent implements OnInit {
}
}
});
});
}
}
shrink
(
policyItem
){
policyItem
.
status
=
!
policyItem
.
status
;
}
}
}
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