我要提问以及薪资单对接

src/app/app.component.scss

@@ -19,7 +19,7 @@
     .closeIcon{
     .closeIcon{
         position: absolute;
         position: absolute;
         right: 2px;
         right: 2px;
-        top: 0;
+        top: -15px;
         color: #fff;
         color: #fff;
         font-size: 18px;
         font-size: 18px;
         border-radius: 50%;
         border-radius: 50%;

src/app/my/salary-detail/salary-detail.component.html

@@ -45,6 +45,14 @@
           <span>直接销售加码佣金</span>
           <span>直接销售加码佣金</span>
           <span class="red">{{direcSalesAddWeightList.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
           <span class="red">{{direcSalesAddWeightList.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
         </div>
         </div>
+        <div class="item_detail" (click)="jumpToFirstYearSales(channelFristYearCommissionList,'首年渠道服务费',1,24)" *ngIf="channelFristYearCommissionList">
+          <span>首年渠道服务费</span>
+          <span class="red">{{channelFristYearCommissionList.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
+        </div>
+        <div class="item_detail" (click)="jumpToFirstYearSales(channelRenewalYearCommissionList,'续年渠道服务费',1,25)" *ngIf="channelRenewalYearCommissionList">
+          <span>续年渠道服务费</span>
+          <span class="red">{{channelRenewalYearCommissionList.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>

src/app/my/salary-detail/salary-detail.component.ts

@@ -63,6 +63,10 @@ export class SalaryDetailComponent implements OnInit {
   direcSalesAddWeightList:any = null;
   direcSalesAddWeightList:any = null;
   //其他
   //其他
   other:any = null;
   other:any = null;
+  // 首年渠道服务费
+  channelFristYearCommissionList:any = null;
+  // 续年渠道服务费
+  channelRenewalYearCommissionList:any = null;
   years:any;
   years:any;
   month:any;
   month:any;
   agent_id:any;
   agent_id:any;
@@ -254,6 +258,10 @@ export class SalaryDetailComponent implements OnInit {
            this.onlineAward = this.salaryDetailsList[i];
            this.onlineAward = this.salaryDetailsList[i];
           }else if(this.salaryDetailsList[i]['salaryCode'] === 'C-006'){
           }else if(this.salaryDetailsList[i]['salaryCode'] === 'C-006'){
             this.other = this.salaryDetailsList[i];
             this.other = this.salaryDetailsList[i];
+          }else if(this.salaryDetailsList[i]['salaryCode'] === 'D-01'){
+            this.channelFristYearCommissionList = this.salaryDetailsList[i];
+          }else if(this.salaryDetailsList[i]['salaryCode'] === 'D-02'){
+            this.channelRenewalYearCommissionList = this.salaryDetailsList[i];
           }else{
           }else{
             break;
             break;
           }
           }

src/app/my/salary-first-year/salary-first-year.component.ts

@@ -57,7 +57,7 @@ export class SalaryFirstYearComponent implements OnInit {
   }
   }
 
 
   /**
   /**
-   * salaryTaype
+   * salaryType
    * 1.首年度销售佣金-》保单
    * 1.首年度销售佣金-》保单
    * 2.续年度销售佣金-》保单
    * 2.续年度销售佣金-》保单
    * 3.首年度辅导奖金-》保单
    * 3.首年度辅导奖金-》保单
@@ -81,6 +81,8 @@ export class SalaryFirstYearComponent implements OnInit {
    * 21.团队长辅导津贴-》体系
    * 21.团队长辅导津贴-》体系
    * 22.育成奖金-》体系
    * 22.育成奖金-》体系
    * 23.直接销售加码佣金-》保单
    * 23.直接销售加码佣金-》保单
+   * 24.首年渠道服务费-》保单
+   * 25.续年渠道服务费-》保单
    */
    */
   searchStaffSalaryDetails(){
   searchStaffSalaryDetails(){
     let param = {
     let param = {
@@ -131,6 +133,10 @@ export class SalaryFirstYearComponent implements OnInit {
           this.policyList = res['data']['breedingBonusList'];
           this.policyList = res['data']['breedingBonusList'];
         }else if(this.salaryType == 23){
         }else if(this.salaryType == 23){
           this.policyList = res['data']['direcSalesAddWeightList'];
           this.policyList = res['data']['direcSalesAddWeightList'];
+        }else if(this.salaryType == 24){
+          this.policyList = res['data']['channelFristYearCommissionList'];
+        }else if(this.salaryType == 25){
+          this.policyList = res['data']['channelRenewalYearCommissionList'];
         }else{
         }else{
           this.OtherCommissionList = res['data']['OtherCommissionList'];
           this.OtherCommissionList = res['data']['OtherCommissionList'];
           if(this.OtherCommissionList && this.OtherCommissionList.length){
           if(this.OtherCommissionList && this.OtherCommissionList.length){