Skip to content

Y
ydLife
Commit 711ca4a7 by sunchao
Options

报聘辅导人必填去掉&产品库添加标签&薪资单接口对接

parent 2437148a
Showing with 126 additions and 55 deletions
src/app/my/product/product.component.html
...@@ -72,10 +72,15 @@ ...@@ -72,10 +72,15 @@
</div> </div>
<div class="priceContent"> <div class="priceContent">
<div> <div>
<span>￥</span><strong>{{productInfoItem.price | number:'1.0-0'}}</strong><span>元起 | 每人每年</span> <span style="color: #F16A5D;">￥</span><strong>{{productInfoItem.price | number:'1.0-0'}}</strong><span>元起 | 每人每年</span>
</div> </div>
<span class="iconfont icon-ar-r"></span> <span class="iconfont icon-ar-r"></span>
</div> </div>
<div class="tagsContent">
<div *ngFor="let tagItem of productInfoItem['tags']">
{{tagItem}}
</div>
</div>
</div> </div>
</div> </div>
......
src/app/my/product/product.component.scss
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
overflow-y: auto; overflow-y: auto;
ul{ ul{
> li { > li {
margin-bottom: 15px; margin-bottom: 10px;
h5 { h5 {
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
...@@ -205,6 +205,16 @@ ...@@ -205,6 +205,16 @@
font-size: 12px; font-size: 12px;
} }
} }
.tagsContent{
display: flex;
flex-wrap: wrap;
div{
padding: 0 5px;
border: 1px #F16A5D solid;
margin: 5px;
border-radius: 10px;
}
}
} }
.dataContent { .dataContent {
display: flex; display: flex;
......
src/app/my/product/product.component.ts
...@@ -186,9 +186,9 @@ export class ProductComponent implements OnInit { ...@@ -186,9 +186,9 @@ export class ProductComponent implements OnInit {
goProductDetail(product: Plans): void { goProductDetail(product: Plans): void {
this.productInfo = product; this.productInfo = product;
this.productInfo.type = 2; this.productInfo.type = 2;
if(this.productInfo.isActive == 4){ if(this.productInfo.isActive == 5){
this.router.navigate(['/productData', product.productId],{queryParams:{planId:product.planId}}); this.router.navigate(['/productData', product.productId],{queryParams:{planId:product.planId}});
}else if(this.productInfo.isActive != 4){ }else if(this.productInfo.isActive != 5){
if(this.productInfo.isActive == 1 && this.productInfo.isThirdPartyPurchase==1 && this.productInfo.thirdPartyPurchaseUrl){ if(this.productInfo.isActive == 1 && this.productInfo.isThirdPartyPurchase==1 && this.productInfo.thirdPartyPurchaseUrl){
window.location.href = this.productInfo.thirdPartyPurchaseUrl; window.location.href = this.productInfo.thirdPartyPurchaseUrl;
}else{ }else{
......
src/app/my/recruiting-detail/recruiting-detail.component.ts
...@@ -474,10 +474,10 @@ export class RecruitingDetailComponent implements OnInit { ...@@ -474,10 +474,10 @@ export class RecruitingDetailComponent implements OnInit {
return; return;
} }
if(this.employQuery.mdDropOptionId != 30){ if(this.employQuery.mdDropOptionId != 30){
if(!this.employQuery.mentorPractitionerId || !this.employQuery.mentor){ // if(!this.employQuery.mentorPractitionerId || !this.employQuery.mentor){
this.openPopInfo('S2级别以下,辅导人不可以为空!') // this.openPopInfo('S2级别以下,辅导人不可以为空!')
return; // return;
} // }
if(this.employQuery.mentorPractitionerId || this.employQuery.mentor){ if(this.employQuery.mentorPractitionerId || this.employQuery.mentor){
if(!this.employQuery.subsystemId || !this.employQuery.subsystem){ if(!this.employQuery.subsystemId || !this.employQuery.subsystem){
this.openPopInfo('该辅导人在系统里还没有归属到某一个体系，请重新选择辅导人！') this.openPopInfo('该辅导人在系统里还没有归属到某一个体系，请重新选择辅导人！')
......
src/app/my/salary-detail/salary-detail.component.html
...@@ -18,32 +18,36 @@ ...@@ -18,32 +18,36 @@
<div class="part"> <div class="part">
<div class="item"> <div class="item">
<div class="title">个人销售(A)</div> <div class="title">个人销售(A)</div>
<div class="item_detail" (click)="jumpToFirstYearSales('首年度销售佣金',1,1)" *ngIf="fycSalesInfo"> <div class="item_detail" (click)="jumpToFirstYearSales('首年度直接销售佣金',1,1)" *ngIf="fycSalesInfo">
<span>首年度销售佣金</span> <span>首年度直接销售佣金</span>
<span class="red">{{fycSalesInfo.commission | number: "1.2-2" }}<i class="iconfont icon-ar-r"></i> </span> <span class="red">{{fycSalesInfo.commission | number: "1.2-2" }}<i class="iconfont icon-ar-r"></i> </span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales('续年度销售佣金',1,2)" *ngIf="rycSalesInfo"> <div class="item_detail" (click)="jumpToFirstYearSales('续年度直接销售佣金',1,2)" *ngIf="rycSalesInfo">
<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('月度销售加码奖金',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">
<span>独立经纪人展业津贴</span>
<span class="red">{{independentBrokerAllowance.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
</div>
</div> </div>
<div class="item"> <div class="item">
<div class="title">销售管理(B)</div> <div class="title">销售管理(B)</div>
<div class="item_detail" (click)="jumpToFirstYearSales('首年度辅导奖金',1,3)" *ngIf="fycTutorInfo"> <div class="item_detail" (click)="jumpToFirstYearSales('首年度辅导佣金',1,3)" *ngIf="fycTutorInfo">
<span>首年度辅导奖金</span> <span>首年度辅导佣金</span>
<span class="red"> {{fycTutorInfo.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span> <span class="red"> {{fycTutorInfo.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales('续年度辅导奖金',1,4)" *ngIf="rycTutorInfo"> <div class="item_detail" (click)="jumpToFirstYearSales('续年度辅导佣金',1,4)" *ngIf="rycTutorInfo">
<span>续年度辅导奖金</span> <span>续年度辅导佣金</span>
<span class="red">{{rycTutorInfo.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span> <span class="red">{{rycTutorInfo.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales('首年度绩效奖金',2,5)" *ngIf="fycMeritsInfo"> <div class="item_detail" (click)="jumpToFirstYearSales('特别管理奖',1,9)" *ngIf="specialManagementAward">
<span>首年度绩效奖金</span> <span>特别管理奖金</span>
<span class="red">{{fycMeritsInfo.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></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('续年度绩效奖金',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>
<div class="item_detail" (click)="jumpToFirstYearSales('推介奖金',1,7)" *ngIf="recommendAward"> <div class="item_detail" (click)="jumpToFirstYearSales('推介奖金',1,7)" *ngIf="recommendAward">
<span>推介奖金</span> <span>推介奖金</span>
...@@ -53,23 +57,39 @@ ...@@ -53,23 +57,39 @@
<span>体系推介奖金</span> <span>体系推介奖金</span>
<span class="red">{{systemRecommendAward.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span> <span class="red">{{systemRecommendAward.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales('特别管理奖',1,9)" *ngIf="specialManagementAward"> <div class="item_detail" (click)="jumpToFirstYearSales('团队管理绩效达标奖金',2,5)" *ngIf="fycMeritsInfo">
<span>特别管理奖金</span> <span>团队管理绩效达标奖金</span>
<span class="red">{{specialManagementAward.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span> <span class="red">{{fycMeritsInfo.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales('续年度绩效奖金',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">
<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">
<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">
<span>育成奖金</span>
<span class="red">{{breedingBonus.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
</div>
</div> </div>
<div class="item"> <div class="item">
<div class="title" style="justify-content: inherit;" (click)="otherToastShow = true"> <div class="title" style="justify-content: inherit;" (click)="otherToastShow = true">
其他加扣款(C) 其他加扣款(C)
<span class="iconfont icon-wenhao" style="margin-top: 3px;color: #f8002e;margin-left: 3px;"></span></div> <span class="iconfont icon-wenhao" style="margin-top: 3px;color: #f8002e;margin-left: 3px;"></span></div>
<div class="item_detail" (click)="jumpToFirstYearSales('其他税前加扣款',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,11)" *ngIf="IncentiveBonus"> <div class="item_detail" (click)="jumpToFirstYearSales('公司激励奖',3,11)" *ngIf="IncentiveBonus">
<span>公司激励奖金</span> <span>公司激励奖金</span>
<span class="red">{{IncentiveBonus.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span> <span class="red">{{IncentiveBonus.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales('其他税前加扣款',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('加码奖金',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/salary.component.html
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</li> </li>
</ul> </ul>
<div class="salesContent" *ngIf="selectedId == 0"> <div class="salesContent" *ngIf="selectedId == 0">
<div class="salesItem" *ngFor="let payScaleItem of payScaleInfos" (click)="enterDetail(payScaleItem.years,payScaleItem.month,payScaleItem.loginName)"> <div class="salesItem" *ngFor="let payScaleItem of payScaleInfos" (click)="enterDetail(payScaleItem.years,payScaleItem.month,payScaleItem.loginName,payScaleItem.isBasic)">
<div class="icon_bolck"><span class="iconfont icon-xinzidan"></span></div> <div class="icon_bolck"><span class="iconfont icon-xinzidan"></span></div>
<div style="padding-left: 45px;padding-right: 20px;"> <div style="padding-left: 45px;padding-right: 20px;">
<div class="line"> <div class="line">
......
src/app/my/salary/salary.component.ts
...@@ -56,8 +56,8 @@ export class SalaryComponent implements OnInit { ...@@ -56,8 +56,8 @@ export class SalaryComponent implements OnInit {
} }
//进入薪资详情 //进入薪资详情
enterDetail(years,month,agent_id){ enterDetail(years,month,agent_id,isBasic){
this.router.navigate(['/salary_detail'],{ queryParams: { years:years,month:month,agent_id:agent_id} }); this.router.navigate(['/salary_detail'],{ queryParams: { years:years,month:month,agent_id:agent_id,isBasic:isBasic} });
} }
//下载pdf //下载pdf
......
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