Skip to content

Y
ydLife
Commit 408c6629 by sunchao
Options

薪资单明细接口调整

parent 51c53002
Showing with 47 additions and 19 deletions
src/app/my/salary-detail/salary-detail.component.html
...@@ -29,15 +29,15 @@ ...@@ -29,15 +29,15 @@
<span>续年直接销售佣金</span> <span>续年直接销售佣金</span>
<span class="red">{{rycSalesInfo.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span> <span class="red">{{rycSalesInfo.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales(monthlySalesAddWeight,'月度销售加码奖金',1,2)" *ngIf="monthlySalesAddWeight"> <div class="item_detail" (click)="jumpToFirstYearSales(monthlySalesAddWeight,'月度销售加码奖金',1,16)" *ngIf="monthlySalesAddWeight">
<span>月度销售加码奖金</span> <span>月度销售加码奖金</span>
<span class="red">{{monthlySalesAddWeight.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span> <span class="red">{{monthlySalesAddWeight.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales(continuedAnnualSalesBonus,'续年度销售加码奖金',1,2)" *ngIf="continuedAnnualSalesBonus"> <div class="item_detail" (click)="jumpToFirstYearSales(continuedAnnualSalesBonus,'续年度销售加码奖金',1,17)" *ngIf="continuedAnnualSalesBonus">
<span>续年度销售加码奖金</span> <span>续年度销售加码奖金</span>
<span class="red">{{continuedAnnualSalesBonus.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span> <span class="red">{{continuedAnnualSalesBonus.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales(independentBrokerAllowance,'独立经纪人展业津贴',1,2)" *ngIf="independentBrokerAllowance"> <div class="item_detail" (click)="jumpToFirstYearSales(independentBrokerAllowance,'独立经纪人展业津贴',1,18)" *ngIf="independentBrokerAllowance">
<span>独立经纪人展业津贴</span> <span>独立经纪人展业津贴</span>
<span class="red">{{independentBrokerAllowance.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span> <span class="red">{{independentBrokerAllowance.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
</div> </div>
...@@ -72,19 +72,19 @@ ...@@ -72,19 +72,19 @@
<span>续年度绩效奖金</span> <span>续年度绩效奖金</span>
<span class="red">{{rycMeritsInfo.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span> <span class="red">{{rycMeritsInfo.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales(directCounseling,'直接辅导岗位津贴',2,6)" *ngIf="directCounseling"> <div class="item_detail" (click)="jumpToFirstYearSales(directCounseling,'直接辅导岗位津贴',2,19)" *ngIf="directCounseling">
<span>直接辅导岗位津贴</span> <span>直接辅导岗位津贴</span>
<span class="red">{{directCounseling.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span> <span class="red">{{directCounseling.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales(indirectCounseling,'隔代辅导岗位津贴',2,6)" *ngIf="indirectCounseling"> <div class="item_detail" (click)="jumpToFirstYearSales(indirectCounseling,'隔代辅导岗位津贴',2,20)" *ngIf="indirectCounseling">
<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="TLCoachingAllowance"> <div class="item_detail" (click)="jumpToFirstYearSales(TLCoachingAllowance,'团队长辅导津贴',2,21)" *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>
<div class="item_detail" (click)="jumpToFirstYearSales(breedingBonus,'育成奖金',2,6)" *ngIf="breedingBonus"> <div class="item_detail" (click)="jumpToFirstYearSales(breedingBonus,'育成奖金',2,22)" *ngIf="breedingBonus">
<span>育成奖金</span> <span>育成奖金</span>
<span class="red">{{breedingBonus.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span> <span class="red">{{breedingBonus.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
</div> </div>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<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"> <div class="item_detail" (click)="jumpToFirstYearSales(other,'其他',3,15)" *ngIf="other">
<span>其它</span> <span>其它</span>
<span class="red">{{other.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span> <span class="red">{{other.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
</div> </div>
......
src/app/my/salary-first-year/salary-first-year.component.html
<div class="wrapper"> <div class="wrapper">
<div class="header"> <div class="header">
<div class="iconfont icon-fanhui" (click)="goBack()"></div> <div class="iconfont icon-fanhui" (click)="goBack()"></div>
<div>{{salaryName}}</div> <div [ngStyle]="{'margin-left':salaryName?.length>='4' ? '0':'20%'}">{{salaryName}}</div>
</div> </div>
<div class="content_wrapper" *ngIf="type=='1'"> <div class="content_wrapper" *ngIf="type=='1'">
<div class="policy_item" *ngFor="let policyItem of policyList"> <div class="policy_item" *ngFor="let policyItem of policyList">
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
<div>保险公司：{{policyItem.Customer.substr(0,10)}}</div> <div>保险公司：{{policyItem.Customer.substr(0,10)}}</div>
<div>生效时间：{{policyItem.EffectiveDate}}</div> <div>生效时间：{{policyItem.EffectiveDate}}</div>
<div>保单号：{{policyItem.Policyno}}</div> <div>保单号：{{policyItem.Policyno}}</div>
<div *ngIf="policyItem.status">保费：{{policyItem.YearPREMIUM | number: "1.2-2"}}</div> <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">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.SaleSystem}}</div>
...@@ -35,9 +36,12 @@ ...@@ -35,9 +36,12 @@
<div>体系FYC/RYC：{{systemItem['FYC/RYC'] | 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;" *ngIf="isBasic==0">
￥{{(systemItem['FYC/RYC']) * (systemItem.Rate/100 ) | number: "1.2-2"}} ￥{{(systemItem['FYC/RYC']) * (systemItem.Rate/100 ) | number: "1.2-2"}}
</div> </div>
<div class="money" style="top: 30px;right: 10px;" *ngIf="isBasic==1">
￥{{systemItem.Commission}}
</div>
</div> </div>
</div> </div>
......
src/app/my/salary-first-year/salary-first-year.component.ts
...@@ -57,19 +57,27 @@ export class SalaryFirstYearComponent implements OnInit { ...@@ -57,19 +57,27 @@ export class SalaryFirstYearComponent implements OnInit {
/** /**
* salaryTaype * salaryTaype
* 1.首年度销售佣金-》保单 * 1.首年度销售佣金-》保单
* 2.月度销售加码奖/续年度销售佣金/独立经纪人展业津贴/续年度销售加码奖金-》保单 * 2.续年度销售佣金-》保单
* 3.首年度辅导奖金-》保单 * 3.首年度辅导奖金-》保单
* 4.续年度辅导奖金-》保单 * 4.续年度辅导奖金-》保单
* 5.首年度绩效奖金-》体系 * 5.首年度绩效奖金-》体系
* 6.续年度绩效奖金/直接辅导岗位津贴/隔代辅导岗位津贴/育成奖金/团队长辅导津贴-》体系 * 6.续年度绩效奖金-》体系
* 7.推介奖金-》保单 * 7.推介奖金-》保单
* 8.体系推介奖金-》体系 * 8.体系推介奖金-》体系
* 9.特别管理奖金-》保单 * 9.特别管理奖金-》保单
* 10.其它税前加扣款/其他-》备注 * 10.其它税前加扣款-》备注
* 11.公司激励奖金-》备注 * 11.公司激励奖金-》备注
* 12.加码奖金-》备注 * 12.加码奖金-》备注
* 13.季度奖金-》备注 * 13.季度奖金-》备注
* 14.银盾在线佣金-》H5 * 14.银盾在线佣金-》H5
* 15.其他-》备注
* 16.月度销售加码奖-》保单
* 17.续年度销售加码奖金-》保单
* 18.独立经纪人展业津贴-》保单
* 19.直接辅导岗位津贴-》体系
* 20.隔代辅导岗位津贴-》体系
* 21.团队长辅导津贴-》体系
* 22.育成奖金-》体系
*/ */
searchStaffSalaryDetails(){ searchStaffSalaryDetails(){
let param = { let param = {
...@@ -103,23 +111,39 @@ export class SalaryFirstYearComponent implements OnInit { ...@@ -103,23 +111,39 @@ export class SalaryFirstYearComponent implements OnInit {
this.systemList = res['data']['RecommendSystemCommissionList']; this.systemList = res['data']['RecommendSystemCommissionList'];
}else if(this.salaryType == 9){ }else if(this.salaryType == 9){
this.policyList = res['data']['SpecialManagementCommissionList']; this.policyList = res['data']['SpecialManagementCommissionList'];
}else if(this.salaryType == 16){
this.policyList = res['data']['monthlySalesAddWeightList'];
}else if(this.salaryType == 17){
this.policyList = res['data']['continuedAnnualSalesBonusList'];
}else if(this.salaryType == 18){
this.policyList = res['data']['independentBrokerAllowanceList'];
}else if(this.salaryType == 19){
this.systemList = res['data']['directCounselingList'];
}else if(this.salaryType == 20){
this.systemList = res['data']['indirectCounselingList'];
}else if(this.salaryType == 21){
this.systemList = res['data']['TLCoachingAllowanceList'];
}else if(this.salaryType == 22){
this.systemList = res['data']['breedingBonusList'];
}else{ }else{
this.OtherCommissionList = res['data']['OtherCommissionList']; this.OtherCommissionList = res['data']['OtherCommissionList'];
if(this.OtherCommissionList && this.OtherCommissionList.length){ if(this.OtherCommissionList && this.OtherCommissionList.length){
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]['Project_Id'] == '91E8A0DD-8696-9964-CD35-AEBA6C8FDF19'){ if(this.salaryType == 10 && (this.OtherCommissionList[i]['Project_Id'] == '91E8A0DD-8696-9964-CD35-AEBA6C8FDF19' || this.OtherCommissionList[i]['salaryCode'] === 'C-002')){
this.remarkInfo = this.OtherCommissionList[i]; this.remarkInfo = this.OtherCommissionList[i];
}else if(this.salaryType == 11 && this.OtherCommissionList[i]['Project_Id'] == '45C0E205-653A-641B-1A35-C5C4148B1DA6'){ }else if(this.salaryType == 11 && (this.OtherCommissionList[i]['Project_Id'] == '45C0E205-653A-641B-1A35-C5C4148B1DA6' || this.OtherCommissionList[i]['salaryCode'] === 'C-001')){
this.remarkInfo = this.OtherCommissionList[i]; this.remarkInfo = this.OtherCommissionList[i];
}else if(this.salaryType == 12 && this.OtherCommissionList[i]['Project_Id'] == 'FC664684-4CBB-E3EC-FEC4-02FDDCAB4A02'){ }else if(this.salaryType == 12 && (this.OtherCommissionList[i]['Project_Id'] == 'FC664684-4CBB-E3EC-FEC4-02FDDCAB4A02' || this.OtherCommissionList[i]['salaryCode'] === 'C-003')){
this.remarkInfo = this.OtherCommissionList[i]; this.remarkInfo = this.OtherCommissionList[i];
}else if(this.salaryType == 13 && this.OtherCommissionList[i]['Project_Id'] == '105B9197-7B64-5AE6-AC47-C15AA857DDC5'){ }else if(this.salaryType == 13 && (this.OtherCommissionList[i]['Project_Id'] == '105B9197-7B64-5AE6-AC47-C15AA857DDC5' || this.OtherCommissionList[i]['salaryCode'] === 'C-004')){
this.remarkInfo = this.OtherCommissionList[i]; this.remarkInfo = this.OtherCommissionList[i];
}else if(this.salaryType == 14 && this.OtherCommissionList[i]['Project_Id'] == '12C24EDF-83D7-081C-AE2C-085031C4DCAF'){ }else if(this.salaryType == 14 && (this.OtherCommissionList[i]['Project_Id'] == '12C24EDF-83D7-081C-AE2C-085031C4DCAF' || this.OtherCommissionList[i]['salaryCode'] === 'C-005')){
//银盾在线佣金 //银盾在线佣金
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()
}else if(this.salaryType == 15 && this.OtherCommissionList[i]['salaryCode'] === 'C-006'){
this.remarkInfo = this.OtherCommissionList[i];
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment