薪资单接口对接

src/app/my/my.service.ts

@@ -640,4 +640,18 @@ export class MyService {
         return res;
         return res;
       });
       });
     }
     }
+
+    //佣金列表
+  querySalaryDetail(param){
+    const url = this.ydapi + '/practitioner/querySalaryDetail';
+    return this.http
+      .post(url, JSON.stringify(param));
+  }
+
+  //薪资对应保单的接口
+  searchStaffSalaryDetails(param){
+    const url = this.ydapi + '/practitioner/searchStaffSalaryDetails';
+    return this.http
+      .post(url, JSON.stringify(param));
+  }
 }
 }

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

 import { Component, OnInit } from '@angular/core';
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute,Router } from "@angular/router";
 import { ActivatedRoute,Router } from "@angular/router";
+import { MyService } from '../my.service';
 
 
 @Component({
 @Component({
   selector: 'ydlife-salary-first-year',
   selector: 'ydlife-salary-first-year',
@@ -8,17 +9,40 @@ import { ActivatedRoute,Router } from "@angular/router";
 })
 })
 export class SalaryFirstYearComponent implements OnInit {
 export class SalaryFirstYearComponent implements OnInit {
   status:boolean;
   status:boolean;
+  //判断跳转页用的
   type:any;
   type:any;
+  //佣奖名称
   salaryName:any;
   salaryName:any;
-  constructor(private activatedRoute: ActivatedRoute) { }
+  //佣奖类型-》用来判断拿保单接口中的哪个数据
+  salaryType:any;
+  month:any;
+  years:any;
+  agent_id:any;
+  constructor(private activatedRoute: ActivatedRoute,private myService:MyService) { }
 
 
   ngOnInit() {
   ngOnInit() {
     this.type = this.activatedRoute.snapshot.queryParams.type?this.activatedRoute.snapshot.queryParams.type:null;
     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;
     this.salaryName = this.activatedRoute.snapshot.queryParams.salaryName?this.activatedRoute.snapshot.queryParams.salaryName:null;
+    this.salaryType = this.activatedRoute.snapshot.paramMap.get('id');
+    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.searchStaffSalaryDetails();
   }
   }
 
 
   goBack(){
   goBack(){
     history.go(-1);
     history.go(-1);
   }
   }
 
 
+  
+  searchStaffSalaryDetails(){
+    const param = {
+      years:this.years,
+      month:this.month,
+      agent_id:this.agent_id
+    }
+    this.myService.searchStaffSalaryDetails(param).subscribe((res)=>{
+      console.log(res)
+    })
+  }
 }
 }

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

@@ -9,16 +9,16 @@
     </li>
     </li>
   </ul>
   </ul>
   <div class="salesContent">
   <div class="salesContent">
-    <div class="salesItem" *ngFor="let payScaleItem of payScaleInfos" (click)="enterDetail(payScaleItem.monDtlPeriod)">
+    <div class="salesItem" *ngFor="let payScaleItem of payScaleInfos" (click)="enterDetail(payScaleItem.years,payScaleItem.month,payScaleItem.loginName)">
       <div class="icon_bolck"><span class="iconfont icon-xinzidan"></span></div>
       <div class="icon_bolck"><span class="iconfont icon-xinzidan"></span></div>
       <div style="padding-left: 45px;padding-right: 20px;">
       <div style="padding-left: 45px;padding-right: 20px;">
         <div class="line">
         <div class="line">
           <span>薪资日期</span>
           <span>薪资日期</span>
-          <div>{{lifeCommonService.getDate(payScaleItem.monDtlPeriod)}}</div>
+          <div>{{payScaleItem.years}}年{{payScaleItem.month}}月</div>
         </div>
         </div>
         <div class="line">
         <div class="line">
-          <span>应发佣金</span>
-          <div class="price" *ngIf="!payScaleItem.pdfOssPath">￥{{payScaleItem.monDtlAmount | number: "1.2-2"}}</div>
+          <span>本期实发佣金</span>
+          <div class="price" *ngIf="!payScaleItem.pdfOssPath">￥{{payScaleItem.monDtlRAmount | number: "1.2-2"}}</div>
         </div>
         </div>
       </div>
       </div>
       <div class="iconfont icon-ar-r" 
       <div class="iconfont icon-ar-r" 

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

@@ -16,7 +16,7 @@ export class SalaryComponent implements OnInit {
   toastDialog: boolean;
   toastDialog: boolean;
   toastInfo: any;
   toastInfo: any;
   tabList:Array<any>;
   tabList:Array<any>;
-  selectedId:any = 1;
+  selectedId:any = 0;
   constructor(private activatedRoute: ActivatedRoute,private myService: MyService,
   constructor(private activatedRoute: ActivatedRoute,private myService: MyService,
      public lifeCommonService: LifeCommonService,
      public lifeCommonService: LifeCommonService,
      private router: Router) { }
      private router: Router) { }
@@ -28,13 +28,13 @@ export class SalaryComponent implements OnInit {
     this.practitionerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId']
     this.practitionerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId']
     this.payScaleListQuery();
     this.payScaleListQuery();
     this.tabList = [
     this.tabList = [
-      {name:'2021年',id:1},
-      {name:'历史薪资',id:2}
+      {name:'2021年',id:0},
+      {name:'历史薪资',id:1}
     ]
     ]
   }
   }
 
 
   payScaleListQuery() {
   payScaleListQuery() {
-    this.myService.payScaleListQuery({ practitionerIdEG: this.practitionerIdEG,practitionerId:this.practitionerId }).subscribe((res) => {
+    this.myService.payScaleListQuery({ practitionerIdEG: this.practitionerIdEG,practitionerId:this.practitionerId,isHistory: this.selectedId}).subscribe((res) => {
       if (res['success']) {
       if (res['success']) {
         this.payScaleInfos = res['data']['payScaleInfos'];
         this.payScaleInfos = res['data']['payScaleInfos'];
       } else {
       } else {
@@ -46,11 +46,12 @@ export class SalaryComponent implements OnInit {
 
 
   selectTab(tabId){
   selectTab(tabId){
     this.selectedId = tabId;
     this.selectedId = tabId;
+    this.payScaleListQuery();
   }
   }
 
 
   //进入薪资详情
   //进入薪资详情
-  enterDetail(monDtlPeriod){
-    this.router.navigate(['/salary_detail'],{ queryParams: { monDtlPeriod:monDtlPeriod} });
+  enterDetail(years,month,agent_id){
+    this.router.navigate(['/salary_detail'],{ queryParams: { years:years,month:month,agent_id:agent_id} });
   }
   }
 }
 }