奖金都显示详情信息

b141205c · Sweet Zhang · b6993a2d · b141205c · b141205c · b141205c
Commit b141205c authored Feb 24, 2022 by Sweet Zhang
5 changed files
--- a/src/app/my/application-process/signature/signature.component.ts
+++ b/src/app/my/application-process/signature/signature.component.ts
@@ -78,7 +78,7 @@ export class SignatureComponent implements OnInit,OnDestroy,AfterViewInit {
    }
    const title = this.activatedRoute.snapshot.data[0]['title'];
    this.lifeCommonService.setTitle(title);
-    if(this.type!='eNotice' && this.type !='continuationRate'){
+    if(this.type!='eNotice' && this.type !='continuationRate' && this.type != 'unionSaleSignature'){
      this.hiringBasicInfoId = this.activatedRoute.snapshot.queryParams.hiringBasicInfoId?this.activatedRoute.snapshot.queryParams.hiringBasicInfoId:null;
      this.queryWholeInfo(this.hiringBasicInfoId)
      this.viewApprovalInfo = sessionStorage.getItem('viewApprovalInfo');

--- a/src/app/my/joint-sale-detail/joint-sale-detail.component.ts
+++ b/src/app/my/joint-sale-detail/joint-sale-detail.component.ts
@@ -8,7 +8,7 @@ declare var rrweb:any;
  templateUrl: './joint-sale-detail.component.html',
  styleUrls: ['./joint-sale-detail.component.scss']
 })
-export class JointSaleDetailComponent implements OnInit,AfterViewInit,OnDestroy {
+export class JointSaleDetailComponent implements OnInit,OnDestroy {
  unionSalesId:any;
  unionSalesPractitionerId:any;
  unionSalesInfo:any;
@@ -24,17 +24,8 @@ export class JointSaleDetailComponent implements OnInit,AfterViewInit,OnDestroy 
  ngOnInit() {
    this.unionSalesId = this.route.snapshot.params['unionSalesId'];
-    console.log(this.route.snapshot)
    this.queryUnionSalesPractitionerList();
  }
-  ngAfterViewInit(): void {
-    setTimeout(()=>{this.creatRecord()},500);
-    this.timerId = setInterval(()=>{
-      if(this.events.length > 100){
-        this.saveRecord()
-      }
-    },10 * 1000);
-  }
  ngOnDestroy(): void {
    clearInterval(this.timerId)
  }
@@ -62,7 +53,18 @@ export class JointSaleDetailComponent implements OnInit,AfterViewInit,OnDestroy 
        this.unionSalesInfo = res['data']['unionSalesInfo'];
        this.unionSalesPractitionerInfos = this.unionSalesInfo.unionSalesPractitionerInfos;
        const practitionerId = localStorage.getItem('lifeCustomerInfo')?JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId']:null;
-        this.unionSalesPractitionerId = this.unionSalesPractitionerInfos.filter(item=>item.practitionerId == practitionerId).pop().id;
+        if(practitionerId){
+          this.unionSalesInfo.signStatus = this.unionSalesPractitionerInfos.filter(item=>item.practitionerId == practitionerId).pop().signStatus
+          this.unionSalesPractitionerId = this.unionSalesPractitionerInfos.filter(item=>item.practitionerId == practitionerId).pop().id;
+          if(this.unionSalesInfo.signStatus=='1'){
+            this.creatRecord();
+            this.timerId = setInterval(()=>{
+              if(this.events.length > 100){
+                this.saveRecord()
+              }
+            },10 * 1000);
+          }
+        }
      }
    })
  }

--- a/src/app/my/joint-sales/joint-sales.component.ts
+++ b/src/app/my/joint-sales/joint-sales.component.ts
@@ -32,7 +32,7 @@ export class JointSalesComponent implements OnInit {
  queryUnionSalesList(signStatus){
-    this.myService.queryUnionSalesList({signStatus:signStatus,isActive:1}).subscribe(res=>{
+    this.myService.queryUnionSalesList({signStatus:signStatus,isActive:1,practitionerId:JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId']}).subscribe(res=>{
      if(res['success']){
        this.unionSalesInfos = res['data']['unionSalesInfos'];
      }

--- a/src/app/my/salary-detail/salary-detail.component.html
+++ b/src/app/my/salary-detail/salary-detail.component.html
@@ -64,7 +64,7 @@
          <span>推荐奖金</span>
          <span class="red">{{recommendAward.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(systemRecommendAward,'体系推荐奖',2,8)" *ngIf="systemRecommendAward">
+        <div class="item_detail" (click)="jumpToFirstYearSales(systemRecommendAward,'体系推荐奖',1,8)" *ngIf="systemRecommendAward">
          <span>体系推荐奖金</span>
          <span class="red">{{systemRecommendAward.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
        </div>
@@ -72,7 +72,7 @@
          <span>团队管理绩效达标奖金</span>
          <span class="red">{{fycMeritsInfo.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(rycMeritsInfo,'续年度绩效奖金',2,6)" *ngIf="rycMeritsInfo">
+        <div class="item_detail" (click)="jumpToFirstYearSales(rycMeritsInfo,'续年度绩效奖金',1,6)" *ngIf="rycMeritsInfo">
          <span>续年度绩效奖金</span>
          <span class="red">{{rycMeritsInfo.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
        </div>
@@ -84,11 +84,11 @@
          <span>隔代辅导岗位津贴</span>
          <span class="red">{{indirectCounseling.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(TLCoachingAllowance,'团队长辅导津贴',2,21)" *ngIf="TLCoachingAllowance">
+        <div class="item_detail" (click)="jumpToFirstYearSales(TLCoachingAllowance,'团队长辅导津贴',1,21)" *ngIf="TLCoachingAllowance">
          <span>团队长辅导津贴</span>
          <span class="red">{{TLCoachingAllowance.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
        </div>
-        <div class="item_detail" (click)="jumpToFirstYearSales(breedingBonus,'育成奖金',2,22)" *ngIf="breedingBonus">
+        <div class="item_detail" (click)="jumpToFirstYearSales(breedingBonus,'育成奖金',1,22)" *ngIf="breedingBonus">
          <span>育成奖金</span>
          <span class="red">{{breedingBonus.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
        </div>

--- a/src/app/my/salary-first-year/salary-first-year.component.ts
+++ b/src/app/my/salary-first-year/salary-first-year.component.ts
@@ -105,11 +105,11 @@ export class SalaryFirstYearComponent implements OnInit {
        }else if(this.salaryType == 5){
          this.policyList = res['data']['fycMeritsInfoList'];
        }else if(this.salaryType == 6){
-          this.systemList = res['data']['RenewalYearPerformanceCommissionList'];
+          this.policyList = res['data']['RenewalYearPerformanceCommissionList'];
        }else if(this.salaryType == 7){
          this.policyList = res['data']['RecommendCommissionList'];
        }else if(this.salaryType == 8){
-          this.systemList = res['data']['RecommendSystemCommissionList'];
+          this.policyList = res['data']['RecommendSystemCommissionList'];
        }else if(this.salaryType == 9){
          this.policyList = res['data']['SpecialManagementCommissionList'];
        }else if(this.salaryType == 16){
@@ -119,20 +119,20 @@ export class SalaryFirstYearComponent implements OnInit {
        }else if(this.salaryType == 18){
          this.policyList = res['data']['independentBrokerAllowanceList'];
        }else if(this.salaryType == 19){
-          this.policyList = res['data']['directCounselingList']; 
+          this.policyList = res['data']['directCounselingList'];
        }else if(this.salaryType == 20){
          this.policyList = res['data']['indirectCounselingList'];
        }else if(this.salaryType == 21){
-          this.systemList = res['data']['tlcoachingAllowanceList'];
+          this.policyList = res['data']['tlcoachingAllowanceList'];
        }else if(this.salaryType == 22){
-          this.systemList = res['data']['breedingBonusList'];
+          this.policyList = res['data']['breedingBonusList'];
        }else if(this.salaryType == 23){
          this.policyList = res['data']['direcSalesAddWeightList'];
        }else{
          this.OtherCommissionList = res['data']['OtherCommissionList'];
          if(this.OtherCommissionList && this.OtherCommissionList.length){
            for(let i=0;i<this.OtherCommissionList.length;i++){
-              if(this.salaryType == 10 && (this.OtherCommissionList[i]['Project_Id'] == '91E8A0DD-8696-9964-CD35-AEBA6C8FDF19' || this.OtherCommissionList[i]['salaryCode'] === 'C-002')){ 
+              if(this.salaryType == 10 && (this.OtherCommissionList[i]['Project_Id'] == '91E8A0DD-8696-9964-CD35-AEBA6C8FDF19' || this.OtherCommissionList[i]['salaryCode'] === 'C-002')){
                this.remarkInfo = this.OtherCommissionList.filter((item)=>{
                  return item.salaryCode == 'C-002' || item.Project_Id == '91E8A0DD-8696-9964-CD35-AEBA6C8FDF19';
                });