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
90a35ae4
Commit
90a35ae4
authored
Sep 08, 2021
by
sunchao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
银盾在线佣金详情
parent
deb0311d
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
53 additions
and
49 deletions
+53
-49
src/app/my/customer-relation/customer-relation.component.ts
+1
-2
src/app/my/my.service.ts
+3
-3
src/app/my/product/product.component.scss
+2
-1
src/app/my/salary-detail/salary-detail.component.html
+19
-19
src/app/my/salary-detail/salary-detail.component.ts
+8
-8
src/app/my/salary-first-year/salary-first-year.component.ts
+20
-16
No files found.
src/app/my/customer-relation/customer-relation.component.ts
View file @
90a35ae4
...
...
@@ -17,8 +17,7 @@ export class CustomerRelationComponent implements OnInit {
}
queryCustomerInsuredList
(){
this
.
myService
.
queryCustomerInsuredList
(
this
.
customerId
).
subscribe
((
res
)
=>
{
console
.
log
(
res
)
this
.
myService
.
queryCustomerInsuredList
({
holderCustomerId
:
this
.
customerId
,
practitionerCustomerId
:
JSON
.
parse
(
localStorage
.
getItem
(
'lifeCustomerInfo'
))[
'customerId'
]}).
subscribe
((
res
)
=>
{
if
(
res
[
'success'
]){
this
.
customerList
=
res
[
'data'
][
'list'
];
}
...
...
src/app/my/my.service.ts
View file @
90a35ae4
...
...
@@ -692,9 +692,9 @@ export class MyService {
}
//客户关系接口
queryCustomerInsuredList
(
customerId
){
const
url
=
this
.
ydapi
+
`/practitioner/queryCustomerInsuredList
/
${
customerId
}
`
return
this
.
http
.
get
(
url
).
pipe
((
res
)
=>
{
queryCustomerInsuredList
(
param
){
const
url
=
this
.
ydapi
+
`/practitioner/queryCustomerInsuredList`
return
this
.
http
.
post
(
url
,
JSON
.
stringify
(
param
)
).
pipe
((
res
)
=>
{
return
res
;
});
}
...
...
src/app/my/product/product.component.scss
View file @
90a35ae4
...
...
@@ -210,7 +210,8 @@
flex-wrap
:
wrap
;
div
{
padding
:
0
5px
;
border
:
1px
#F16A5D
solid
;
// border: 1px #F16A5D solid;
border
:
1px
#dcdcdc
solid
;
margin
:
5px
;
border-radius
:
10px
;
}
...
...
src/app/my/salary-detail/salary-detail.component.html
View file @
90a35ae4
...
...
@@ -18,62 +18,62 @@
<div
class=
"part"
>
<div
class=
"item"
>
<div
class=
"title"
>
个人销售(A)
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('首年度直接销售佣金',
1
,
1
)"
*
ngIf=
"fycSalesInfo"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
fycSalesInfo
,
'首年度直接销售佣金',
1
,
1
)"
*
ngIf=
"fycSalesInfo"
>
<span>
首年度直接销售佣金
</span>
<span
class=
"red"
>
{{fycSalesInfo.commission | number: "1.2-2" }}
<i
class=
"iconfont icon-ar-r"
></i>
</span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('续年度直接销售佣金',
1
,
2
)"
*
ngIf=
"rycSalesInfo"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
rycSalesInfo
,
'续年度直接销售佣金',
1
,
2
)"
*
ngIf=
"rycSalesInfo"
>
<span>
续年度直接销售佣金
</span>
<span
class=
"red"
>
{{rycSalesInfo.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('月度销售加码奖金',
1
,
2
)"
*
ngIf=
"monthlySalesAddWeight"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
monthlySalesAddWeight
,
'月度销售加码奖金',
1
,
2
)"
*
ngIf=
"monthlySalesAddWeight"
>
<span>
月度销售加码奖金
</span>
<span
class=
"red"
>
{{monthlySalesAddWeight.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('独立经纪人展业津贴',
1
,
2
)"
*
ngIf=
"independentBrokerAllowance"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
independentBrokerAllowance
,
'独立经纪人展业津贴',
1
,
2
)"
*
ngIf=
"independentBrokerAllowance"
>
<span>
独立经纪人展业津贴
</span>
<span
class=
"red"
>
{{independentBrokerAllowance.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
</div>
<div
class=
"item"
>
<div
class=
"title"
>
销售管理(B)
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('首年度辅导佣金',
1
,
3
)"
*
ngIf=
"fycTutorInfo"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
fycTutorInfo
,
'首年度辅导佣金',
1
,
3
)"
*
ngIf=
"fycTutorInfo"
>
<span>
首年度辅导佣金
</span>
<span
class=
"red"
>
{{fycTutorInfo.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('续年度辅导佣金',
1
,
4
)"
*
ngIf=
"rycTutorInfo"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
rycTutorInfo
,
'续年度辅导佣金',
1
,
4
)"
*
ngIf=
"rycTutorInfo"
>
<span>
续年度辅导佣金
</span>
<span
class=
"red"
>
{{rycTutorInfo.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('特别管理奖',
1
,
9
)"
*
ngIf=
"specialManagementAward"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
specialManagementAward
,
'特别管理奖',
1
,
9
)"
*
ngIf=
"specialManagementAward"
>
<span>
特别管理奖金
</span>
<span
class=
"red"
>
{{specialManagementAward.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('推介奖金',
1
,
7
)"
*
ngIf=
"recommendAward"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
recommendAward
,
'推介奖金',
1
,
7
)"
*
ngIf=
"recommendAward"
>
<span>
推介奖金
</span>
<span
class=
"red"
>
{{recommendAward.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('体系推介奖',
2
,
8
)"
*
ngIf=
"systemRecommendAward"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
systemRecommendAward
,
'体系推介奖',
2
,
8
)"
*
ngIf=
"systemRecommendAward"
>
<span>
体系推介奖金
</span>
<span
class=
"red"
>
{{systemRecommendAward.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('团队管理绩效达标奖金',
2
,
5
)"
*
ngIf=
"fycMeritsInfo"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
fycMeritsInfo
,
'团队管理绩效达标奖金',
2
,
5
)"
*
ngIf=
"fycMeritsInfo"
>
<span>
团队管理绩效达标奖金
</span>
<span
class=
"red"
>
{{fycMeritsInfo.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('续年度绩效奖金',
2
,
6
)"
*
ngIf=
"rycMeritsInfo"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
rycMeritsInfo
,
'续年度绩效奖金',
2
,
6
)"
*
ngIf=
"rycMeritsInfo"
>
<span>
续年度绩效奖金
</span>
<span
class=
"red"
>
{{rycMeritsInfo.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('直接辅导岗位津贴',
2
,
6
)"
*
ngIf=
"directCounseling"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
directCounseling
,
'直接辅导岗位津贴',
2
,
6
)"
*
ngIf=
"directCounseling"
>
<span>
直接辅导岗位津贴
</span>
<span
class=
"red"
>
{{directCounseling.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('间接辅导岗位津贴',
2
,
6
)"
*
ngIf=
"indirectCounseling"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
indirectCounseling
,
'间接辅导岗位津贴',
2
,
6
)"
*
ngIf=
"indirectCounseling"
>
<span>
间接辅导岗位津贴
</span>
<span
class=
"red"
>
{{indirectCounseling.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('育成奖金',
2
,
6
)"
*
ngIf=
"breedingBonus"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
breedingBonus
,
'育成奖金',
2
,
6
)"
*
ngIf=
"breedingBonus"
>
<span>
育成奖金
</span>
<span
class=
"red"
>
{{breedingBonus.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
...
...
@@ -82,23 +82,23 @@
<div
class=
"title"
style=
"justify-content: inherit;"
(
click
)="
otherToastShow =
true"
>
其他加扣款(C)
<span
class=
"iconfont icon-wenhao"
style=
"margin-top: 3px;color: #f8002e;margin-left: 3px;"
></span></div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('公司激励奖',
3
,
11
)"
*
ngIf=
"IncentiveBonus"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
IncentiveBonus
,
'公司激励奖',
3
,
11
)"
*
ngIf=
"IncentiveBonus"
>
<span>
公司激励奖金
</span>
<span
class=
"red"
>
{{IncentiveBonus.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('其他税前加扣款',
3
,
10
)"
*
ngIf=
"otherPreTaxDeduction"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
otherPreTaxDeduction
,
'其他税前加扣款',
3
,
10
)"
*
ngIf=
"otherPreTaxDeduction"
>
<span>
其它税前加扣款
</span>
<span
class=
"red"
>
{{otherPreTaxDeduction.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('加码奖金',
3
,
12
)"
*
ngIf=
"addWeight"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
addWeight
,
'加码奖金',
3
,
12
)"
*
ngIf=
"addWeight"
>
<span>
加码奖金
</span>
<span
class=
"red"
>
{{addWeight.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('季度奖金',
3
,
13
)"
*
ngIf=
"quarterlyBonus"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
quarterlyBonus
,
'季度奖金',
3
,
13
)"
*
ngIf=
"quarterlyBonus"
>
<span>
季度奖金
</span>
<span
class=
"red"
>
{{quarterlyBonus.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
('银盾在线佣金',
4
,
14
)"
*
ngIf=
"onlineAward"
>
<div
class=
"item_detail"
(
click
)="
jumpToFirstYearSales
(
onlineAward
,
'银盾在线佣金',
4
,
14
)"
*
ngIf=
"onlineAward"
>
<span>
银盾在线佣金
</span>
<span
class=
"red"
>
{{onlineAward.commission | number: "1.2-2"}}
<i
class=
"iconfont icon-ar-r"
></i></span>
</div>
...
...
src/app/my/salary-detail/salary-detail.component.ts
View file @
90a35ae4
...
...
@@ -123,6 +123,7 @@ export class SalaryDetailComponent implements OnInit {
this
.
month
=
this
.
payScaleInfos
[
i
+
1
][
'month'
];
this
.
years
=
this
.
payScaleInfos
[
i
+
1
][
'years'
];
this
.
isBasic
=
this
.
payScaleInfos
[
i
+
1
][
'isBasic'
];
this
.
agent_id
=
this
.
payScaleInfos
[
i
+
1
][
'loginName'
];
this
.
lifeCommonService
.
setTitle
(
`
${
this
.
years
}
年
${
this
.
month
}
月本期实发佣金`
);
this
.
initSalay
();
}
...
...
@@ -140,6 +141,7 @@ export class SalaryDetailComponent implements OnInit {
this
.
month
=
this
.
payScaleInfos
[
i
-
1
][
'month'
];
this
.
years
=
this
.
payScaleInfos
[
i
-
1
][
'years'
];
this
.
isBasic
=
this
.
payScaleInfos
[
i
-
1
][
'isBasic'
];
this
.
agent_id
=
this
.
payScaleInfos
[
i
-
1
][
'loginName'
];
this
.
lifeCommonService
.
setTitle
(
`
${
this
.
years
}
年
${
this
.
month
}
月本期实发佣金`
);
this
.
initSalay
();
break
;
...
...
@@ -232,15 +234,13 @@ export class SalaryDetailComponent implements OnInit {
* 3.跳转到备注
* 4.跳转到银盾在线
*/
jumpToFirstYearSales
(
salaryName
,
type
,
salaryType
){
if
(
this
.
isBasic
==
1
){
const
toast
=
ToastService
.
show
(
'手动录入的薪资单,暂时不能查看详情!'
,
0
);
setTimeout
(()
=>
{
ToastService
.
hide
();
},
3000
);
return
;
jumpToFirstYearSales
(
item
,
salaryName
,
type
,
salaryType
){
if
(
this
.
isBasic
==
1
&&
salaryName
!=
'银盾在线佣金'
){
if
(
item
.
pdfOssPath
){
window
.
location
.
href
=
item
.
pdfOssPath
;
}
}
else
{
this
.
router
.
navigate
([
`/salary_detail/
${
salaryType
}
`
],{
queryParams
:{
type
:
type
,
salaryName
:
salaryName
,
years
:
this
.
years
,
month
:
this
.
month
,
agent_id
:
this
.
agent_id
}});
this
.
router
.
navigate
([
`/salary_detail/
${
salaryType
}
`
],{
queryParams
:{
type
:
type
,
salaryName
:
salaryName
,
years
:
this
.
years
,
month
:
this
.
month
,
agent_id
:
this
.
agent_id
,
isBasic
:
this
.
isBasic
}});
}
}
...
...
src/app/my/salary-first-year/salary-first-year.component.ts
View file @
90a35ae4
...
...
@@ -28,6 +28,7 @@ export class SalaryFirstYearComponent implements OnInit {
OtherCommissionList
:
Array
<
any
>
;
withdrawId
:
any
;
customerFortuneWithdraws
:
Array
<
any
>
;
isBasic
:
any
;
constructor
(
private
activatedRoute
:
ActivatedRoute
,
private
myService
:
MyService
)
{
}
ngOnInit
()
{
...
...
@@ -37,6 +38,7 @@ export class SalaryFirstYearComponent implements OnInit {
this
.
years
=
this
.
activatedRoute
.
snapshot
.
queryParams
.
years
?
this
.
activatedRoute
.
snapshot
.
queryParams
.
years
:
null
;
this
.
month
=
this
.
activatedRoute
.
snapshot
.
queryParams
.
month
?
this
.
activatedRoute
.
snapshot
.
queryParams
.
month
:
null
;
this
.
agent_id
=
this
.
activatedRoute
.
snapshot
.
queryParams
.
agent_id
?
this
.
activatedRoute
.
snapshot
.
queryParams
.
agent_id
:
null
;
this
.
isBasic
=
this
.
activatedRoute
.
snapshot
.
queryParams
.
isBasic
?
this
.
activatedRoute
.
snapshot
.
queryParams
.
isBasic
:
null
;
this
.
searchStaffSalaryDetails
();
}
...
...
@@ -66,7 +68,8 @@ export class SalaryFirstYearComponent implements OnInit {
years
:
this
.
years
,
month
:
this
.
month
,
agent_id
:
this
.
agent_id
,
practitionerId
:
JSON
.
parse
(
localStorage
.
getItem
(
'lifeCustomerInfo'
))[
'practitionerId'
]
practitionerId
:
JSON
.
parse
(
localStorage
.
getItem
(
'lifeCustomerInfo'
))[
'practitionerId'
],
isBasic
:
this
.
isBasic
}
this
.
myService
.
searchStaffSalaryDetails
(
param
).
subscribe
((
res
)
=>
{
if
(
res
[
'data'
]){
...
...
@@ -90,23 +93,24 @@ export class SalaryFirstYearComponent implements OnInit {
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
][
'Project_Id'
]
==
'91E8A0DD-8696-9964-CD35-AEBA6C8FDF19'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
11
&&
this
.
OtherCommissionList
[
i
][
'Project_Id'
]
==
'45C0E205-653A-641B-1A35-C5C4148B1DA6'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
12
&&
this
.
OtherCommissionList
[
i
][
'Project_Id'
]
==
'FC664684-4CBB-E3EC-FEC4-02FDDCAB4A02'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
13
&&
this
.
OtherCommissionList
[
i
][
'Project_Id'
]
==
'105B9197-7B64-5AE6-AC47-C15AA857DDC5'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
14
&&
this
.
OtherCommissionList
[
i
][
'Project_Id'
]
==
'12C24EDF-83D7-081C-AE2C-085031C4DCAF'
){
//银盾在线佣金
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
this
.
withdrawId
=
this
.
OtherCommissionList
[
i
][
'withdrawedId'
];
this
.
fortuneWithdrawListQuery
()
if
(
this
.
OtherCommissionList
&&
this
.
OtherCommissionList
.
length
){
for
(
let
i
=
0
;
i
<
this
.
OtherCommissionList
.
length
;
i
++
){
if
(
this
.
salaryType
==
10
&&
this
.
OtherCommissionList
[
i
][
'Project_Id'
]
==
'91E8A0DD-8696-9964-CD35-AEBA6C8FDF19'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
11
&&
this
.
OtherCommissionList
[
i
][
'Project_Id'
]
==
'45C0E205-653A-641B-1A35-C5C4148B1DA6'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
12
&&
this
.
OtherCommissionList
[
i
][
'Project_Id'
]
==
'FC664684-4CBB-E3EC-FEC4-02FDDCAB4A02'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
13
&&
this
.
OtherCommissionList
[
i
][
'Project_Id'
]
==
'105B9197-7B64-5AE6-AC47-C15AA857DDC5'
){
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
}
else
if
(
this
.
salaryType
==
14
&&
this
.
OtherCommissionList
[
i
][
'Project_Id'
]
==
'12C24EDF-83D7-081C-AE2C-085031C4DCAF'
){
//银盾在线佣金
this
.
remarkInfo
=
this
.
OtherCommissionList
[
i
];
this
.
withdrawId
=
this
.
OtherCommissionList
[
i
][
'withdrawedId'
];
this
.
fortuneWithdrawListQuery
()
}
}
}
}
}
})
...
...
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