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 @@
</div>
<div class="priceContent">
<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>
<span class="iconfont icon-ar-r"></span>
</div>
<div class="tagsContent">
<div *ngFor="let tagItem of productInfoItem['tags']">
{{tagItem}}
</div>
</div>
</div>
</div>
......
src/app/my/product/product.component.scss
......@@ -94,7 +94,7 @@
overflow-y: auto;
ul{
> li {
margin-bottom: 15px;
margin-bottom: 10px;
h5 {
font-size: 16px;
font-weight: bold;
......@@ -205,6 +205,16 @@
font-size: 12px;
}
}
.tagsContent{
display: flex;
flex-wrap: wrap;
div{
padding: 0 5px;
border: 1px #F16A5D solid;
margin: 5px;
border-radius: 10px;
}
}
}
.dataContent {
display: flex;
......
src/app/my/product/product.component.ts
......@@ -186,9 +186,9 @@ export class ProductComponent implements OnInit {
goProductDetail(product: Plans): void {
this.productInfo = product;
this.productInfo.type = 2;
if(this.productInfo.isActive == 4){
if(this.productInfo.isActive == 5){
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){
window.location.href = this.productInfo.thirdPartyPurchaseUrl;
}else{
......
src/app/my/recruiting-detail/recruiting-detail.component.ts
......@@ -474,10 +474,10 @@ export class RecruitingDetailComponent implements OnInit {
return;
}
if(this.employQuery.mdDropOptionId != 30){
if(!this.employQuery.mentorPractitionerId || !this.employQuery.mentor){
this.openPopInfo('S2级别以下,辅导人不可以为空!')
return;
}
// if(!this.employQuery.mentorPractitionerId || !this.employQuery.mentor){
// this.openPopInfo('S2级别以下,辅导人不可以为空!')
// return;
// }
if(this.employQuery.mentorPractitionerId || this.employQuery.mentor){
if(!this.employQuery.subsystemId || !this.employQuery.subsystem){
this.openPopInfo('该辅导人在系统里还没有归属到某一个体系，请重新选择辅导人！')
......
src/app/my/salary-detail/salary-detail.component.html
......@@ -18,32 +18,36 @@
<div class="part">
<div class="item">
<div class="title">个人销售(A)</div>
<div class="item_detail" (click)="jumpToFirstYearSales('首年度销售佣金',1,1)" *ngIf="fycSalesInfo">
<span>首年度销售佣金</span>
<div class="item_detail" (click)="jumpToFirstYearSales('首年度直接销售佣金',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">
<span>续年度销售佣金</span>
<div class="item_detail" (click)="jumpToFirstYearSales('续年度直接销售佣金',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">
<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 class="item">
<div class="title">销售管理(B)</div>
<div class="item_detail" (click)="jumpToFirstYearSales('首年度辅导奖金',1,3)" *ngIf="fycTutorInfo">
<span>首年度辅导奖金</span>
<div class="item_detail" (click)="jumpToFirstYearSales('首年度辅导佣金',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">
<span>续年度辅导奖金</span>
<div class="item_detail" (click)="jumpToFirstYearSales('续年度辅导佣金',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('首年度绩效奖金',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">
<span>续年度绩效奖金</span>
<span class="red">{{rycMeritsInfo.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
<div class="item_detail" (click)="jumpToFirstYearSales('特别管理奖',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">
<span>推介奖金</span>
......@@ -53,23 +57,39 @@
<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('特别管理奖',1,9)" *ngIf="specialManagementAward">
<span>特别管理奖金</span>
<span class="red">{{specialManagementAward.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
<div class="item_detail" (click)="jumpToFirstYearSales('团队管理绩效达标奖金',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">
<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 class="item">
<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,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">
<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">
<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">
<span>加码奖金</span>
<span class="red">{{addWeight.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
......
src/app/my/salary-detail/salary-detail.component.ts
......@@ -21,11 +21,15 @@ export class SalaryDetailComponent implements OnInit {
fycSalesInfo:any = null;
//续年度销售佣金
rycSalesInfo:any = null;
//首年度辅导奖
//月度销售加码奖
monthlySalesAddWeight:any = null;
//独立经纪人展业津贴
independentBrokerAllowance:any = null;
//首年度直接销售佣金
fycTutorInfo:any = null;
//续年度辅导奖
//续年度直接销售佣金
rycTutorInfo:any = null;
//首年度绩效奖金
//首年度绩效奖金/团队管理绩效达标奖金
fycMeritsInfo:any = null;
//续年度续缴奖
rycMeritsInfo:any = null;
......@@ -35,6 +39,12 @@ export class SalaryDetailComponent implements OnInit {
systemRecommendAward:any = null;
//特别管理奖
specialManagementAward:any = null;
//直接辅导岗位津贴
directCounseling:any = null;
//间接辅导岗位津贴
indirectCounseling:any = null;
//育成奖金
breedingBonus:any = null;
//其他税前加扣款
otherPreTaxDeduction:any = null;
//激励奖金
......@@ -67,6 +77,7 @@ export class SalaryDetailComponent implements OnInit {
//其他加扣款问号
otherTaxFlag:boolean = false;
abc:number;
isBasic:any;
constructor(private _toast: ToastService,public lifeCommonService: LifeCommonService,
private activatedRoute: ActivatedRoute,
private router:Router,
......@@ -79,6 +90,7 @@ export class SalaryDetailComponent 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.lifeCommonService.setTitle(`${this.years}年本期实发佣金`);
this.querySalaryDetail(null);
......@@ -110,6 +122,7 @@ export class SalaryDetailComponent implements OnInit {
}else{
this.month = this.payScaleInfos[i+1]['month'];
this.years = this.payScaleInfos[i+1]['years'];
this.isBasic = this.payScaleInfos[i+1]['isBasic'];
this.lifeCommonService.setTitle(`${this.years}年${this.month}月本期实发佣金`);
this.initSalay();
}
......@@ -126,6 +139,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.lifeCommonService.setTitle(`${this.years}年${this.month}月本期实发佣金`);
this.initSalay();
break;
......@@ -135,11 +149,13 @@ export class SalaryDetailComponent implements OnInit {
}
}
this.router.navigate(['/salary_detail'],{ queryParams: { years:this.years,month:this.month,agent_id:this.agent_id},replaceUrl: true});
this.router.navigate(['/salary_detail'],{ queryParams: { years:this.years,month:this.month,agent_id:this.agent_id,isBasic:this.isBasic},replaceUrl: true});
const param = {
years:this.years,
month:this.month,
agent_id:this.agent_id
agent_id:this.agent_id,
practitionerId:this.practitionerId,
isBasic:this.isBasic
}
this.myService.querySalaryDetail(param).subscribe((res)=>{
this.totalCommission = res['data']['abc'];
......@@ -158,33 +174,43 @@ export class SalaryDetailComponent implements OnInit {
//本期应扣所得税
this.personal_tax = this.salaryDetailsList[0]['personal_tax'];
this.after_tax_comis = this.salaryDetailsList[0]['after_tax_comis'];
if(this.salaryDetailsList[i]['project_id'] === '54DB1075-AEF2-5F4C-ABDF-899F9EB66439'){
if(this.salaryDetailsList[i]['project_id'] === '54DB1075-AEF2-5F4C-ABDF-899F9EB66439' || this.salaryDetailsList[i]['salaryCode'] == 'A-001'){
this.fycSalesInfo = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === 'C6D9AEC2-18DF-0404-0FE6-AAB659A32E0F'){
}else if(this.salaryDetailsList[i]['project_id'] === 'C6D9AEC2-18DF-0404-0FE6-AAB659A32E0F' || this.salaryDetailsList[i]['salaryCode'] == 'A-002'){
this.rycSalesInfo = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === 'E55EC426-65E2-2AD5-4AA7-9B821396C1F4'){
}else if(this.salaryDetailsList[i]['salaryCode'] === 'A-003'){
this.monthlySalesAddWeight = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['salaryCode'] === 'A-004'){
this.independentBrokerAllowance = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === 'E55EC426-65E2-2AD5-4AA7-9B821396C1F4' || this.salaryDetailsList[i]['salaryCode'] === 'B-001'){
this.fycTutorInfo = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === 'F9E5ED14-7248-A5D7-490D-651399E814A6'){
}else if(this.salaryDetailsList[i]['project_id'] === 'F9E5ED14-7248-A5D7-490D-651399E814A6' || this.salaryDetailsList[i]['salaryCode'] === 'B-002'){
this.rycTutorInfo = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === 'DB5B8AB9-B904-BA9D-F6DC-F1E7FD4A60DA'){
}else if(this.salaryDetailsList[i]['project_id'] === 'DB5B8AB9-B904-BA9D-F6DC-F1E7FD4A60DA' || this.salaryDetailsList[i]['salaryCode'] === 'B-006'){
this.fycMeritsInfo = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === '0F70B51D-C7D6-316D-8EDC-CFBC7A5D4551'){
}else if(this.salaryDetailsList[i]['project_id'] === '0F70B51D-C7D6-316D-8EDC-CFBC7A5D4551' || this.salaryDetailsList[i]['salaryCode'] === 'B-007'){
this.rycMeritsInfo = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === '6EDF61DF-7C16-2625-9A54-D5E03CA7E6B1'){
}else if(this.salaryDetailsList[i]['salaryCode'] === 'B-008'){
this.directCounseling = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['salaryCode'] === 'B-009'){
this.indirectCounseling = this.salaryDetailsList[i];
}else if (this.salaryDetailsList[i]['salaryCode'] === 'B-010'){
this.breedingBonus = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === '6EDF61DF-7C16-2625-9A54-D5E03CA7E6B1' || this.salaryDetailsList[i]['salaryCode'] === 'B-004'){
this.recommendAward = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === 'DDCCD63D-EE47-5953-8CA0-CFAA83CB9A5E'){
}else if(this.salaryDetailsList[i]['project_id'] === 'DDCCD63D-EE47-5953-8CA0-CFAA83CB9A5E' || this.salaryDetailsList[i]['salaryCode'] === 'B-005'){
this.systemRecommendAward = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === 'A09E7626-B77C-79A0-CC93-D929BCBB7B35' || this.salaryDetailsList[i]['project_id'] === '871C458C-CF54-F2A6-589F-EFEE1EE16B25'){
}else if(this.salaryDetailsList[i]['project_id'] === 'A09E7626-B77C-79A0-CC93-D929BCBB7B35' || this.salaryDetailsList[i]['project_id'] === '871C458C-CF54-F2A6-589F-EFEE1EE16B25' || this.salaryDetailsList[i]['salaryCode'] === 'B-003'){
this.specialManagementAward = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === '91E8A0DD-8696-9964-CD35-AEBA6C8FDF19'){
}else if(this.salaryDetailsList[i]['project_id'] === '91E8A0DD-8696-9964-CD35-AEBA6C8FDF19' || this.salaryDetailsList[i]['salaryCode'] === 'C-002'){
this.otherPreTaxDeduction = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === '45C0E205-653A-641B-1A35-C5C4148B1DA6'){
}else if(this.salaryDetailsList[i]['project_id'] === '45C0E205-653A-641B-1A35-C5C4148B1DA6' || this.salaryDetailsList[i]['salaryCode'] === 'C-001'){
this.IncentiveBonus = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === 'FC664684-4CBB-E3EC-FEC4-02FDDCAB4A02'){
}else if(this.salaryDetailsList[i]['project_id'] === 'FC664684-4CBB-E3EC-FEC4-02FDDCAB4A02' || this.salaryDetailsList[i]['salaryCode'] === 'C-003'){
this.addWeight = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === '105B9197-7B64-5AE6-AC47-C15AA857DDC5'){
}else if(this.salaryDetailsList[i]['project_id'] === '105B9197-7B64-5AE6-AC47-C15AA857DDC5' || this.salaryDetailsList[i]['salaryCode'] === 'C-004'){
this.quarterlyBonus = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === '12C24EDF-83D7-081C-AE2C-085031C4DCAF'){
}else if(this.salaryDetailsList[i]['project_id'] === '12C24EDF-83D7-081C-AE2C-085031C4DCAF' || this.salaryDetailsList[i]['salaryCode'] === 'C-005'){
this.onlineAward = this.salaryDetailsList[i];
}else{
break;
......@@ -207,7 +233,15 @@ export class SalaryDetailComponent implements OnInit {
* 4.跳转到银盾在线
*/
jumpToFirstYearSales(salaryName,type,salaryType){
this.router.navigate([`/salary_detail/${salaryType}`],{queryParams:{type:type,salaryName:salaryName,years:this.years,month:this.month,agent_id:this.agent_id}});
if(this.isBasic == 1){
const toast = ToastService.show('手动录入的薪资单，暂时不能查看详情！', 0);
setTimeout(() => {
ToastService.hide();
}, 3000);
return;
}else{
this.router.navigate([`/salary_detail/${salaryType}`],{queryParams:{type:type,salaryName:salaryName,years:this.years,month:this.month,agent_id:this.agent_id}});
}
}
//薪资单列表-》用来判断上一期下一期的加减
......@@ -222,8 +256,10 @@ export class SalaryDetailComponent implements OnInit {
//初始化佣奖类型
initSalay(){
this.fycSalesInfo = this.rycSalesInfo = this.fycTutorInfo = this.rycTutorInfo = this.fycMeritsInfo =
this.rycMeritsInfo= this.recommendAward= this.systemRecommendAward= this.specialManagementAward=
this.otherPreTaxDeduction= this.IncentiveBonus=this.addWeight= this.quarterlyBonus= this.onlineAward= null;
this.rycMeritsInfo= this.recommendAward= this.systemRecommendAward = this.specialManagementAward=
this.otherPreTaxDeduction = this.IncentiveBonus = this.addWeight = this.quarterlyBonus= this.onlineAward=
this.monthlySalesAddWeight = this.independentBrokerAllowance =this.directCounseling = this.indirectCounseling=
this.breedingBonus = null;
}
goBack(){
......
src/app/my/salary/salary.component.html
......@@ -9,7 +9,7 @@
</li>
</ul>
<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 style="padding-left: 45px;padding-right: 20px;">
<div class="line">
......
src/app/my/salary/salary.component.ts
......@@ -56,8 +56,8 @@ export class SalaryComponent implements OnInit {
}
//进入薪资详情
enterDetail(years,month,agent_id){
this.router.navigate(['/salary_detail'],{ queryParams: { years:years,month:month,agent_id:agent_id} });
enterDetail(years,month,agent_id,isBasic){
this.router.navigate(['/salary_detail'],{ queryParams: { years:years,month:month,agent_id:agent_id,isBasic:isBasic} });
}
//下载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