薪资单详情

e9e1936c · sunchao · 655a843f · e9e1936c · e9e1936c · e9e1936c
Commit e9e1936c authored May 24, 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
@@ -41,15 +41,15 @@
          <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)">
+        <div class="item_detail" (click)="jumpToFirstYearSales('推介奖金',1)">
          <span>推介奖金</span>
          <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(2)">
+        <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)">
+        <div class="item_detail" (click)="jumpToFirstYearSales('特别管理奖',1)">
          <span>特别管理奖金</span>
          <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
        </div>
@@ -58,23 +58,23 @@
        <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(6)">
+        <div class="item_detail" (click)="jumpToFirstYearSales('其他税前加扣款',3)">
          <span>其它税前加扣款</span>
          <span class="red">225.00<i class="iconfont icon-ar-r"></i></span>
        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(6)">
+        <div class="item_detail" (click)="jumpToFirstYearSales('公司激励奖',3)">
          <span>公司激励奖金</span>
          <span class="red">225.00<i class="iconfont icon-ar-r"></i></span>
        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(6)">
+        <div class="item_detail" (click)="jumpToFirstYearSales('加码奖金',3)">
          <span>加码奖金</span>
          <span class="red">225.00<i class="iconfont icon-ar-r"></i></span>
        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(6)">
+        <div class="item_detail" (click)="jumpToFirstYearSales('季度奖金',3)">
          <span>季度奖金</span>
          <span class="red">225.00<i class="iconfont icon-ar-r"></i></span>
        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(6)">
+        <div class="item_detail" (click)="jumpToFirstYearSales('银盾在线佣金',3)">
          <span>银盾在线佣金</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
@@ -54,85 +54,85 @@ export class SalaryDetailComponent implements OnInit {
        "Project_id": "54DB1075-AEF2-5F4C-ABDF-899F9EB66439",
        "SalaryName": "银盾首年度销售佣金",
        "SalaryType": "业绩佣金",
-        "sumcommission": 348359.37,
+        "commission": 348359.37,
    },
    {
      "Project_id": "C6D9AEC2-18DF-0404-0FE6-AAB659A32E0F",
      "SalaryName": "银盾续年度销售佣金",
      "SalaryType": "业绩佣金",
-      "sumcommission": 93373.27,
+      "commission": 93373.27,
    },
    {
      "Project_id": "E55EC426-65E2-2AD5-4AA7-9B821396C1F4",
      "SalaryName": "银盾首年度辅导奖金",
      "SalaryType": "业绩佣金",
-      "sumcommission": 93373.27,
+      "commission": 93373.27,
    },
    {
      "Project_id": "F9E5ED14-7248-A5D7-490D-651399E814A6",
      "SalaryName": "银盾续年度辅导奖金",
      "SalaryType": "业绩佣金",
-      "sumcommission": 20698.46,
+      "commission": 20698.46,
    },
    {
      "Project_id": "DB5B8AB9-B904-BA9D-F6DC-F1E7FD4A60DA",
      "SalaryName": "银盾管理奖金-首年度绩效奖金",
      "SalaryType": "业绩佣金",
-      "sumcommission": 348359.37,
+      "commission": 348359.37,
    },
    {
      "Project_id": "0F70B51D-C7D6-316D-8EDC-CFBC7A5D4551",
      "SalaryName": "银盾管理奖金-续年度续缴奖金",
      "SalaryType": "业绩佣金",
-      "sumcommission": 20698.46,
+      "commission": 20698.46,
    },
    {
      "Project_id": "6EDF61DF-7C16-2625-9A54-D5E03CA7E6B1",
      "SalaryName": "银盾推介奖金-同体系/跨体系推介奖金",
      "SalaryType": "业绩佣金",
-      "sumcommission": 20698.46,
+      "commission": 20698.46,
    },
    {
      "Project_id": "DDCCD63D-EE47-5953-8CA0-CFAA83CB9A5E",
      "SalaryName": "银盾推介奖金-推介体系奖金",
      "SalaryType": "业绩佣金",
-      "sumcommission": 20698.46,
+      "commission": 20698.46,
    },
    {
      "Project_id": "A09E7626-B77C-79A0-CC93-D929BCBB7B35",
      "SalaryName": "银盾管理奖金-业务合伙人特别管理奖金",
      "SalaryType": "业绩佣金",
-      "sumcommission": 348359.37,
+      "commission": 348359.37,
    },
    {
      "Project_id": "91E8A0DD-8696-9964-CD35-AEBA6C8FDF19",
      "SalaryName": "其它税前加扣款",
      "SalaryType": "加扣款项",
-      "sumcommission": 17130.65,
+      "commission": 17130.65,
    },
    {
      "Project_id": "45C0E205-653A-641B-1A35-C5C4148B1DA6",
      "SalaryName": "公司激励奖金",
      "SalaryType": "加扣款项",
-      "sumcommission": 17130.65,
+      "commission": 17130.65,
    },
    {
      "Project_id": "FC664684-4CBB-E3EC-FEC4-02FDDCAB4A02",
      "SalaryName": "加码奖金",
      "SalaryType": "加扣款项",
-      "sumcommission": 17130.65,
+      "commission": 17130.65,
    },
    {
      "Project_id": "105B9197-7B64-5AE6-AC47-C15AA857DDC5",
      "SalaryName": "季度奖金",
      "SalaryType": "加扣款项",
-      "sumcommission": 17130.65,
+      "commission": 17130.65,
    },
    {
      "Project_id": "12C24EDF-83D7-081C-AE2C-085031C4DCAF",
      "SalaryName": "银盾在线佣金",
      "SalaryType": "加扣款项",
-      "sumcommission": 348359.37,
+      "commission": 348359.37,
    }
    ]
    for(let i=0;i<this.salaryDetailsList.length;i++){
@@ -179,6 +179,7 @@ export class SalaryDetailComponent implements OnInit {
   * @param type
   * 1.跳转到保单
   * 2.跳转到体系
+   * 3.跳转到备注
   */
  jumpToFirstYearSales(salaryName,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
@@ -3,7 +3,7 @@
    <div class="iconfont icon-fanhui" (click)="goBack()"></div>
    <div>{{salaryName}}</div>
  </div>
-  <div class="content_wrapper">
+  <div class="content_wrapper" *ngIf="type=='1'">
    <div class="policy_item">
      <div class="icon_bolck"><i class="iconfont icon-money-more"></i></div>
      <div class="line_item">
@@ -26,4 +26,18 @@
      </div>
    </div>
  </div>
+  <div class="content_wrapper" *ngIf="type=='2'">
+    <div class="policy_item">
+      <div class="icon_bolck" style="top: 28px;"><i class="iconfont icon-money-more"></i></div>
+      <div class="line_item">
+        <div>体系名称：财商姐</div>
+        <div>体系FYC/RYC：1,800</div>
+        <div>佣金比率：20%</div>
+      </div>
+      <div class="money" style="top: 30px;right: 10px;">
+        ￥1,800.00 
+      </div>
+    </div>
+  </div>
 </div>
--- a/src/app/my/salary/salary.component.html
+++ b/src/app/my/salary/salary.component.html
@@ -9,9 +9,9 @@
    </li>
  </ul>
  <div class="salesContent">
-    <div class="salesItem" *ngFor="let payScaleItem of payScaleInfos">
+    <div class="salesItem" *ngFor="let payScaleItem of payScaleInfos" (click)="enterDetail(payScaleItem.monDtlPeriod)">
-      <div  class="icon_bolck"><span class="iconfont icon-xinzidan"></span></div>
+      <div class="icon_bolck"><span class="iconfont icon-xinzidan"></span></div>
-      <div (click)="enterDetail(payScaleItem.monDtlPeriod)" style="padding-left: 45px;padding-right: 20px;">
+      <div style="padding-left: 45px;padding-right: 20px;">
        <div class="line">
          <span>薪资日期</span>
          <div>{{lifeCommonService.getDate(payScaleItem.monDtlPeriod)}}</div>