薪资单页面调整

38d456f7 · sunchao · 370398cb · 38d456f7 · 38d456f7 · 38d456f7
Commit 38d456f7 authored May 20, 2021 by sunchao
4 changed files
--- a/src/app/my/approval-comments/approval-comments.component.ts
+++ b/src/app/my/approval-comments/approval-comments.component.ts
@@ -53,7 +53,7 @@ export class ApprovalCommentsComponent implements OnInit {
    }
    this.myService.hiringApprove(param).subscribe((res)=>{
      if(res['success']){
-        this.openPopInfo('保存成功！');
+        this.openPopInfo('你的审批成功');
        sessionStorage.setItem('viewApprovalInfo','1')
      }else{
        this.openPopInfo(res['message']);

--- a/src/app/my/salary-detail/salary-detail.component.html
+++ b/src/app/my/salary-detail/salary-detail.component.html
@@ -15,38 +15,38 @@
      <div class="item">
        <div class="title">个人销售(A)</div>
        <div class="item_detail" (click)="jumpToFirstYearSales(1)">
-          <span>首年度销售佣金</span>
+          <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)">
-          <span>续年度销售佣金</span>
+          <span>{{rycSalesInfo.SalaryName}}</span>
-          <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
-        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(2)">
-          <span>推介奖金</span>
-          <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
-        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(2)">
-          <span>体系推介奖金</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)">
-          <span>首年度辅导奖金</span>
+          <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)">
-          <span>续年度辅导奖金</span>
+          <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)">
-          <span>首年度绩效奖金</span>
+          <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)">
-          <span>续年度绩效奖金</span>
+          <span>{{rycMeritsInfo.SalaryName}}</span>
+          <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
+        </div>
+        <div class="item_detail" (click)="jumpToFirstYearSales(2)">
+          <span>推介奖金</span>
+          <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
+        </div>
+        <div class="item_detail" (click)="jumpToFirstYearSales(2)">
+          <span>体系推介奖金</span>
          <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
        </div>
        <div class="item_detail" (click)="jumpToFirstYearSales(5)">
@@ -59,11 +59,23 @@
          其他加扣款(C)
          <span class="iconfont icon-wenhao" style="margin-top: 3px;color: #f8002e;margin-left: 3px;"></span></div>
        <div class="item_detail" (click)="jumpToFirstYearSales(6)">
-          <span>其他加扣款</span>
+          <span>其它税前加扣款</span>
+          <span class="red">225.00<i class="iconfont icon-ar-r"></i></span>
+        </div>
+        <div class="item_detail" (click)="jumpToFirstYearSales(6)">
+          <span>公司激励奖金</span>
+          <span class="red">225.00<i class="iconfont icon-ar-r"></i></span>
+        </div>
+        <div class="item_detail" (click)="jumpToFirstYearSales(6)">
+          <span>加码奖金</span>
+          <span class="red">225.00<i class="iconfont icon-ar-r"></i></span>
+        </div>
+        <div class="item_detail" (click)="jumpToFirstYearSales(6)">
+          <span>季度奖金</span>
          <span class="red">225.00<i class="iconfont icon-ar-r"></i></span>
        </div>
        <div class="item_detail" (click)="jumpToFirstYearSales(6)">
-          <span>加码奖</span>
+          <span>银盾在线佣金</span>
          <span class="red">225.00<i class="iconfont icon-ar-r"></i></span>
        </div>
      </div>

--- a/src/app/my/salary-detail/salary-detail.component.ts
+++ b/src/app/my/salary-detail/salary-detail.component.ts
@@ -13,6 +13,27 @@ export class SalaryDetailComponent implements OnInit {
  takFlag:boolean = false;
  taxToastShow:boolean;
  otherToastShow:boolean;
+  salaryDetailsList:Array<any>;
+  //首年度销售佣金
+  fycSalesInfo:any = null;
+  //续年度销售佣金
+  rycSalesInfo:any = null;
+  //首年度辅导奖
+  fycTutorInfo:any = null;
+  //续年度辅导奖
+  rycTutorInfo:any = null;
+  //首年度绩效奖金
+  fycMeritsInfo:any = null;
+  //续年度续缴奖
+  rycMeritsInfo:any = null;
+  //推介奖
+  recommendAward:any = null;
+  //体系推介奖
+  systemRecommendAward:any = null;
+  //特别管理奖
+  specialManagementAward:any = null;
+  //其他税前加扣款
+  otherPreTaxDeduction:any = null;
  constructor(public lifeCommonService: LifeCommonService,
    private activatedRoute: ActivatedRoute,
    private router:Router) { }
@@ -20,6 +41,121 @@ export class SalaryDetailComponent implements OnInit {
  ngOnInit() {
    this.monDtlPeriod = this.activatedRoute.snapshot.queryParams.monDtlPeriod?this.activatedRoute.snapshot.queryParams.monDtlPeriod:null;
    this.lifeCommonService.setTitle(`${this.lifeCommonService.getDate(this.monDtlPeriod)}本期实发佣金`);
+    this.salaryDetailsList = [
+      {
+        "Project_id": "54DB1075-AEF2-5F4C-ABDF-899F9EB66439",
+        "SalaryName": "银盾首年度销售佣金",
+        "SalaryType": "业绩佣金",
+        "sumcommission": 348359.37,
+    },
+    {
+      "Project_id": "C6D9AEC2-18DF-0404-0FE6-AAB659A32E0F",
+      "SalaryName": "银盾续年度销售佣金",
+      "SalaryType": "业绩佣金",
+      "sumcommission": 93373.27,
+    },
+    {
+      "Project_id": "E55EC426-65E2-2AD5-4AA7-9B821396C1F4",
+      "SalaryName": "银盾首年度辅导奖金",
+      "SalaryType": "业绩佣金",
+      "sumcommission": 93373.27,
+    },
+    {
+      "Project_id": "F9E5ED14-7248-A5D7-490D-651399E814A6",
+      "SalaryName": "银盾续年度辅导奖金",
+      "SalaryType": "业绩佣金",
+      "sumcommission": 20698.46,
+    },
+    {
+      "Project_id": "DB5B8AB9-B904-BA9D-F6DC-F1E7FD4A60DA",
+      "SalaryName": "银盾管理奖金-首年度绩效奖金",
+      "SalaryType": "业绩佣金",
+      "sumcommission": 348359.37,
+    },
+    {
+      "Project_id": "0F70B51D-C7D6-316D-8EDC-CFBC7A5D4551",
+      "SalaryName": "银盾管理奖金-续年度续缴奖金",
+      "SalaryType": "业绩佣金",
+      "sumcommission": 20698.46,
+    },
+    {
+      "Project_id": "6EDF61DF-7C16-2625-9A54-D5E03CA7E6B1",
+      "SalaryName": "银盾推介奖金-同体系/跨体系推介奖金",
+      "SalaryType": "业绩佣金",
+      "sumcommission": 20698.46,
+    },
+    {
+      "Project_id": "DDCCD63D-EE47-5953-8CA0-CFAA83CB9A5E",
+      "SalaryName": "银盾推介奖金-推介体系奖金",
+      "SalaryType": "业绩佣金",
+      "sumcommission": 20698.46,
+    },
+    {
+      "Project_id": "A09E7626-B77C-79A0-CC93-D929BCBB7B35",
+      "SalaryName": "银盾管理奖金-业务合伙人特别管理奖金",
+      "SalaryType": "业绩佣金",
+      "sumcommission": 348359.37,
+    },
+    {
+      "Project_id": "91E8A0DD-8696-9964-CD35-AEBA6C8FDF19",
+      "SalaryName": "其它税前加扣款",
+      "SalaryType": "加扣款项",
+      "sumcommission": 17130.65,
+    },
+    {
+      "Project_id": "45C0E205-653A-641B-1A35-C5C4148B1DA6",
+      "SalaryName": "公司激励奖金",
+      "SalaryType": "加扣款项",
+      "sumcommission": 17130.65,
+    },
+    {
+      "Project_id": "91E8A0DD-8696-9964-CD35-AEBA6C8FDF19",
+      "SalaryName": "其它税前加扣款",
+      "SalaryType": "加扣款项",
+      "sumcommission": 17130.65,
+    },
+    {
+      "Project_id": "FC664684-4CBB-E3EC-FEC4-02FDDCAB4A02",
+      "SalaryName": "加码奖金",
+      "SalaryType": "加扣款项",
+      "sumcommission": 17130.65,
+    },
+    {
+      "Project_id": "105B9197-7B64-5AE6-AC47-C15AA857DDC5",
+      "SalaryName": "季度奖金",
+      "SalaryType": "加扣款项",
+      "sumcommission": 17130.65,
+    },
+    {
+      "Project_id": "12C24EDF-83D7-081C-AE2C-085031C4DCAF",
+      "SalaryName": "银盾在线佣金",
+      "SalaryType": "加扣款项",
+      "sumcommission": 348359.37,
+    }
+    ]
+    for(let i=0;i<this.salaryDetailsList.length;i++){
+      if(this.salaryDetailsList[i]['Project_id'] === '54DB1075-AEF2-5F4C-ABDF-899F9EB66439'){
+        this.fycSalesInfo = this.salaryDetailsList[i];
+      }else if(this.salaryDetailsList[i]['Project_id'] === 'C6D9AEC2-18DF-0404-0FE6-AAB659A32E0F'){
+        this.rycSalesInfo = this.salaryDetailsList[i];
+      }else if(this.salaryDetailsList[i]['Project_id'] === 'E55EC426-65E2-2AD5-4AA7-9B821396C1F4'){
+        this.fycTutorInfo = this.salaryDetailsList[i];
+      }else if(this.salaryDetailsList[i]['Project_id'] === 'F9E5ED14-7248-A5D7-490D-651399E814A6'){
+        this.rycTutorInfo = this.salaryDetailsList[i];
+      }else if(this.salaryDetailsList[i]['Project_id'] === 'DB5B8AB9-B904-BA9D-F6DC-F1E7FD4A60DA'){
+        this.fycMeritsInfo = this.salaryDetailsList[i];
+      }else if(this.salaryDetailsList[i]['Project_id'] === '0F70B51D-C7D6-316D-8EDC-CFBC7A5D4551'){
+        this.rycMeritsInfo = this.salaryDetailsList[i];
+      }else if(this.salaryDetailsList[i]['Project_id'] === '6EDF61DF-7C16-2625-9A54-D5E03CA7E6B1'){
+        this.recommendAward = this.salaryDetailsList[i];
+      }else if(this.salaryDetailsList[i]['Project_id'] === 'DDCCD63D-EE47-5953-8CA0-CFAA83CB9A5E'){
+       this.systemRecommendAward = this.salaryDetailsList[i];
+      }else if(this.salaryDetailsList[i]['Project_id'] === 'A09E7626-B77C-79A0-CC93-D929BCBB7B35'){
+       this.specialManagementAward = this.salaryDetailsList[i];
+      }else if(this.salaryDetailsList[i]['Project_id'] === '91E8A0DD-8696-9964-CD35-AEBA6C8FDF19'){
+       this.otherPreTaxDeduction = this.salaryDetailsList[i];
+      }
+    }
  }
  lookTak(){

--- a/src/app/my/salary/salary.component.html
+++ b/src/app/my/salary/salary.component.html
@@ -11,7 +11,7 @@
  <div class="salesContent">
    <div class="salesItem" *ngFor="let payScaleItem of payScaleInfos">
      <div  class="icon_bolck"><span class="iconfont icon-xinzidan"></span></div>
-      <div (click)="enterDetail(payScaleItem.monDtlPeriod)" style="padding-left: 45px;">
+      <div (click)="enterDetail(payScaleItem.monDtlPeriod)" style="padding-left: 45px;padding-right: 20px;">
        <div class="line">
          <span>薪资日期</span>
          <div>{{lifeCommonService.getDate(payScaleItem.monDtlPeriod)}}</div>
@@ -21,6 +21,8 @@
          <div class="price" *ngIf="!payScaleItem.pdfOssPath">￥{{payScaleItem.monDtlAmount | number: "1.2-2"}}</div>
        </div>
      </div>
+      <div class="iconfont icon-ar-r" 
+      style="width: 20px;height: 20px;position: absolute;right: 2px;top: 23px;"></div>
    </div>
    <div style="text-align: center;margin-top: 20px;" *ngIf="payScaleInfos?.length<=0">暂无数据</div>
  </div>