薪资单详情增加字段

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

@@ -86,6 +86,7 @@ export class SalaryDetailComponent implements OnInit {
   otherTaxFlag:boolean = false;
   otherTaxFlag:boolean = false;
   abc:number;
   abc:number;
   isBasic:any;
   isBasic:any;
+  commissionPayoutStatus:any;
   //  是否是预览薪资单
   //  是否是预览薪资单
   isPreSalary:boolean;
   isPreSalary:boolean;
   preFlag:string;
   preFlag:string;
@@ -102,6 +103,7 @@ export class SalaryDetailComponent implements OnInit {
       this.years = this.lifeCommonService.getQueryString('years');
       this.years = this.lifeCommonService.getQueryString('years');
       this.month = this.lifeCommonService.getQueryString('month');
       this.month = this.lifeCommonService.getQueryString('month');
       this.isBasic = this.lifeCommonService.getQueryString('isBasic');
       this.isBasic = this.lifeCommonService.getQueryString('isBasic');
+      this.commissionPayoutStatus = this.lifeCommonService.getQueryString('commissionPayoutStatus');
       this.lifeCommonService.setTitle(`${this.years}年本期实发佣金`);
       this.lifeCommonService.setTitle(`${this.years}年本期实发佣金`);
       this.querySalaryDetail(null);
       this.querySalaryDetail(null);
     }else{
     }else{
@@ -180,7 +182,8 @@ export class SalaryDetailComponent implements OnInit {
       month:this.month,
       month:this.month,
       agent_id:this.agent_id,
       agent_id:this.agent_id,
       practitionerId:this.practitionerId,
       practitionerId:this.practitionerId,
-      isBasic:this.isBasic
+      isBasic:this.isBasic,
+      commissionPayoutStatus:this.commissionPayoutStatus
     }
     }
     if(this.isPreSalary){
     if(this.isPreSalary){
       // param['isActive'] = '1',
       // param['isActive'] = '1',
@@ -277,14 +280,14 @@ export class SalaryDetailComponent implements OnInit {
         window.open( item.pdfOssPath)
         window.open( item.pdfOssPath)
       }else{
       }else{
         if(this.isPreSalary){
         if(this.isPreSalary){
-          this.router.navigate([`/salary_detail/${salaryType}`],{queryParams:{type:type,salaryName:salaryName,years:this.years,month:this.month,agent_id:this.agent_id,isBasic:this.isBasic,preFlag:this.preFlag,practitionerId:this.practitionerId}});
+          this.router.navigate([`/salary_detail/${salaryType}`],{queryParams:{type:type,salaryName:salaryName,years:this.years,month:this.month,agent_id:this.agent_id,isBasic:this.isBasic,preFlag:this.preFlag,practitionerId:this.practitionerId,commissionPayoutStatus:this.commissionPayoutStatus}});
         }else{
         }else{
           this.router.navigate([`/salary_detail/${salaryType}`],{queryParams:{type:type,salaryName:salaryName,years:this.years,month:this.month,agent_id:this.agent_id,isBasic:this.isBasic}});
           this.router.navigate([`/salary_detail/${salaryType}`],{queryParams:{type:type,salaryName:salaryName,years:this.years,month:this.month,agent_id:this.agent_id,isBasic:this.isBasic}});
         }
         }
       }
       }
     }else{
     }else{
       if(this.isPreSalary){
       if(this.isPreSalary){
-        this.router.navigate([`/salary_detail/${salaryType}`],{queryParams:{type:type,salaryName:salaryName,years:this.years,month:this.month,agent_id:this.agent_id,isBasic:this.isBasic,preFlag:this.preFlag,practitionerId:this.practitionerId}});
+        this.router.navigate([`/salary_detail/${salaryType}`],{queryParams:{type:type,salaryName:salaryName,years:this.years,month:this.month,agent_id:this.agent_id,isBasic:this.isBasic,preFlag:this.preFlag,practitionerId:this.practitionerId,commissionPayoutStatus:this.commissionPayoutStatus}});
       }else{
       }else{
         this.router.navigate([`/salary_detail/${salaryType}`],{queryParams:{type:type,salaryName:salaryName,years:this.years,month:this.month,agent_id:this.agent_id,isBasic:this.isBasic}});
         this.router.navigate([`/salary_detail/${salaryType}`],{queryParams:{type:type,salaryName:salaryName,years:this.years,month:this.month,agent_id:this.agent_id,isBasic:this.isBasic}});
       }
       }

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

@@ -31,6 +31,7 @@ export class SalaryFirstYearComponent implements OnInit {
   withdrawId:any;
   withdrawId:any;
   customerFortuneWithdraws:Array<any>;
   customerFortuneWithdraws:Array<any>;
   isBasic:any;
   isBasic:any;
+  commissionPayoutStatus:any;
   preFlag:string = this.lifeCommonService.getQueryString('preFlag');
   preFlag:string = this.lifeCommonService.getQueryString('preFlag');
   constructor(private activatedRoute: ActivatedRoute,private myService:MyService,private lifeCommonService:LifeCommonService) { }
   constructor(private activatedRoute: ActivatedRoute,private myService:MyService,private lifeCommonService:LifeCommonService) { }
 
 
@@ -42,6 +43,7 @@ export class SalaryFirstYearComponent implements OnInit {
     this.month = this.activatedRoute.snapshot.queryParams.month?this.activatedRoute.snapshot.queryParams.month: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.agent_id = this.activatedRoute.snapshot.queryParams.agent_id?this.activatedRoute.snapshot.queryParams.agent_id:null;
     this.isBasic = this.activatedRoute.snapshot.queryParams.isBasic?this.activatedRoute.snapshot.queryParams.isBasic:null;
     this.isBasic = this.activatedRoute.snapshot.queryParams.isBasic?this.activatedRoute.snapshot.queryParams.isBasic:null;
+    this.commissionPayoutStatus = this.activatedRoute.snapshot.queryParams.commissionPayoutStatus?this.activatedRoute.snapshot.queryParams.commissionPayoutStatus:'4';
     if(this.preFlag==='AGMS'){
     if(this.preFlag==='AGMS'){
       this.practitionerId = this.lifeCommonService.getQueryString('practitionerId');
       this.practitionerId = this.lifeCommonService.getQueryString('practitionerId');
     }else{
     }else{
@@ -86,7 +88,8 @@ export class SalaryFirstYearComponent implements OnInit {
       month:this.month,
       month:this.month,
       agent_id:this.agent_id,
       agent_id:this.agent_id,
       practitionerId:this.practitionerId,
       practitionerId:this.practitionerId,
-      isBasic:this.isBasic
+      isBasic:this.isBasic,
+      commissionPayoutStatus:this.commissionPayoutStatus
     }
     }
     if(this.preFlag==='AGMS'){
     if(this.preFlag==='AGMS'){
       param['isActive'] = 1;
       param['isActive'] = 1;