薪资单详情页判断

655a843f · sunchao · 38d456f7 · 655a843f · 655a843f · 655a843f
Commit 655a843f authored May 21, 2021 by sunchao
4 changed files
--- a/src/app/my/salary-detail/salary-detail.component.html
+++ b/src/app/my/salary-detail/salary-detail.component.html
@@ -14,30 +14,30 @@
    <div class="part">
      <div class="item">
        <div class="title">个人销售(A)</div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(1)">
+        <div class="item_detail" (click)="jumpToFirstYearSales(fycSalesInfo.SalaryName,1)" *ngIf="fycSalesInfo">
          <span>{{fycSalesInfo.SalaryName}}</span>
          <span class="red">18,505.00 <i class="iconfont icon-ar-r"></i> </span>
        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(2)">
+        <div class="item_detail" (click)="jumpToFirstYearSales(rycSalesInfo.SalaryName,1)" *ngIf="rycSalesInfo">
          <span>{{rycSalesInfo.SalaryName}}</span>
          <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
        </div>
      </div>
      <div class="item">
        <div class="title">销售管理(B)</div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(3)">
+        <div class="item_detail" (click)="jumpToFirstYearSales(fycTutorInfo.SalaryName,1)" *ngIf="fycTutorInfo">
          <span>{{fycTutorInfo.SalaryName}}</span>
          <span class="red">18,505.00 <i class="iconfont icon-ar-r"></i></span>
        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(4)">
+        <div class="item_detail" (click)="jumpToFirstYearSales(rycTutorInfo.SalaryName,1)" *ngIf="rycTutorInfo">
          <span>{{rycTutorInfo.SalaryName}}</span>
          <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(3)">
+        <div class="item_detail" (click)="jumpToFirstYearSales(fycMeritsInfo.SalaryName,2)" *ngIf="fycMeritsInfo">
          <span>{{fycMeritsInfo.SalaryName}}</span>
          <span class="red">18,505.00 <i class="iconfont icon-ar-r"></i></span>
        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(4)">
+        <div class="item_detail" (click)="jumpToFirstYearSales(rycMeritsInfo.SalaryName,2)" *ngIf="rycMeritsInfo">
          <span>{{rycMeritsInfo.SalaryName}}</span>
          <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
        </div>

--- a/src/app/my/salary-detail/salary-detail.component.ts
+++ b/src/app/my/salary-detail/salary-detail.component.ts
@@ -34,6 +34,14 @@ export class SalaryDetailComponent implements OnInit {
  specialManagementAward:any = null;
  //其他税前加扣款
  otherPreTaxDeduction:any = null;
+  //激励奖金
+  IncentiveBonus:any = null;
+  //加码奖金
+  addWeight:any = null;
+  //季度奖
+  quarterlyBonus:any = null;
+  //银盾在线奖
+  onlineAward:any = null;
  constructor(public lifeCommonService: LifeCommonService,
    private activatedRoute: ActivatedRoute,
    private router:Router) { }
@@ -109,12 +117,6 @@ export class SalaryDetailComponent implements OnInit {
      "sumcommission": 17130.65,
    },
    {
-      "Project_id": "91E8A0DD-8696-9964-CD35-AEBA6C8FDF19",
-      "SalaryName": "其它税前加扣款",
-      "SalaryType": "加扣款项",
-      "sumcommission": 17130.65,
-    },
-    {
      "Project_id": "FC664684-4CBB-E3EC-FEC4-02FDDCAB4A02",
      "SalaryName": "加码奖金",
      "SalaryType": "加扣款项",
@@ -154,6 +156,16 @@ export class SalaryDetailComponent implements OnInit {
       this.specialManagementAward = this.salaryDetailsList[i];
      }else if(this.salaryDetailsList[i]['Project_id'] === '91E8A0DD-8696-9964-CD35-AEBA6C8FDF19'){
       this.otherPreTaxDeduction = this.salaryDetailsList[i];
+      }else if(this.salaryDetailsList[i]['Project_id'] === '45C0E205-653A-641B-1A35-C5C4148B1DA6'){
+        this.IncentiveBonus = this.salaryDetailsList[i];
+      }else if(this.salaryDetailsList[i]['Project_id'] === 'FC664684-4CBB-E3EC-FEC4-02FDDCAB4A02'){
+       this.addWeight = this.salaryDetailsList[i];
+      }else if(this.salaryDetailsList[i]['Project_id'] === '105B9197-7B64-5AE6-AC47-C15AA857DDC5'){
+       this.quarterlyBonus = this.salaryDetailsList[i];
+      }else if(this.salaryDetailsList[i]['Project_id'] === '12C24EDF-83D7-081C-AE2C-085031C4DCAF'){
+       this.onlineAward = this.salaryDetailsList[i];
+      }else{
+        break;
      }
    }
  }
@@ -164,16 +176,11 @@ export class SalaryDetailComponent implements OnInit {
  /**
   * 
-   * @param type 
+   * @param type
-   * 1.首年度销售佣金
+   * 1.跳转到保单
-   * 2.续年度销售佣金
+   * 2.跳转到体系
-   * 3.首年度辅导奖金
-   * 4.续年度辅导奖金
-   * 5.特别管理奖金
-   * 6.其他应税加扣款
   */
-  jumpToFirstYearSales(type){
+  jumpToFirstYearSales(salaryName,type){
-    this.router.navigate([`/salary_detail/${this.monDtlPeriod}`],{queryParams:{type:type}});
+    this.router.navigate([`/salary_detail/${this.monDtlPeriod}`],{queryParams:{type:type,salaryName:salaryName}});
  }
 }
--- a/src/app/my/salary-first-year/salary-first-year.component.html
+++ b/src/app/my/salary-first-year/salary-first-year.component.html
 <div class="wrapper">
  <div class="header">
    <div class="iconfont icon-fanhui" (click)="goBack()"></div>
-    <div>{{getTitleName(type)}}</div>
+    <div>{{salaryName}}</div>
  </div>
  <div class="content_wrapper">
    <div class="policy_item">

--- a/src/app/my/salary-first-year/salary-first-year.component.ts
+++ b/src/app/my/salary-first-year/salary-first-year.component.ts
@@ -9,33 +9,16 @@ import { ActivatedRoute,Router } from "@angular/router";
 export class SalaryFirstYearComponent implements OnInit {
  status:boolean;
  type:any;
+  salaryName:any;
  constructor(private activatedRoute: ActivatedRoute) { }
  ngOnInit() {
    this.type = this.activatedRoute.snapshot.queryParams.type?this.activatedRoute.snapshot.queryParams.type:null;
+    this.salaryName = this.activatedRoute.snapshot.queryParams.salaryName?this.activatedRoute.snapshot.queryParams.salaryName:null;
  }
  goBack(){
    history.go(-1);
  }
-  getTitleName(type){
-    switch (type){
-      case '1':
-        return '首年度销售佣金';
-      case '2':
-        return '续年度销售佣金';
-      case '3':
-        return '首年度辅导奖金';
-      case '4':
-        return '续年度辅导奖金';
-      case '5':
-        return '特别管理奖金';
-      case '6':
-        return '其他应税加扣款';
-      default :
-        return '/'
-    }
-  }
 }