薪资单明细代码逻辑调整

2056a590 · sunchao · 930b63e9 · 2056a590 · 2056a590 · 2056a590
Commit 2056a590 authored Jan 05, 2022 by sunchao
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 10 deletions

src/app/my/salary-first-year/salary-first-year.component.html
+3 -3

src/app/my/salary-first-year/salary-first-year.component.ts
+16 -6

src/app/my/salary/salary.component.html
+1 -1

No files found.
--- a/src/app/my/salary-first-year/salary-first-year.component.html
+++ b/src/app/my/salary-first-year/salary-first-year.component.html
@@ -30,11 +30,11 @@
  <div class="content_wrapper" *ngIf="type=='2'">
    <div class="policy_item" *ngFor="let systemItem of systemList">
-      <div class="icon_bolck" style="top: 28px;"><i class="iconfont icon-money-more"></i></div>
+      <div class="icon_bolck" style="top: 15px;"><i class="iconfont icon-money-more"></i></div>
      <div class="line_item">
        <div>体系名称：{{systemItem.SaleSystem}}</div>
        <div>体系FYC/RYC：{{systemItem['FYC/RYC'] | number: "1.2-2"}}</div>
-        <div>佣奖比例：{{systemItem.Rate}}%</div>
+        <!-- <div>佣奖比例：{{systemItem.Rate}}%</div> -->
      </div>
      <div class="money" style="top: 30px;right: 10px;" *ngIf="isBasic==0">
        ￥{{(systemItem['FYC/RYC']) * (systemItem.Rate/100 ) | number: "1.2-2"}}
@@ -46,7 +46,7 @@
  </div>
  <div class="content_wrapper" *ngIf="type=='3'">
-    <div class="policy_item" style="padding-bottom: 10px;">
+    <div class="policy_item" style="padding-bottom: 10px;" *ngFor="let remarkInfo of remarkInfo">
      <div class="icon_bolck" style="top: 14px;"><i class="iconfont icon-money-more"></i></div>
      <div class="line_item">
        <div>{{remarkInfo?.CommissionName}}： {{remarkInfo?.Commission | number: "1.2-2"}}</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
@@ -129,21 +129,31 @@ export class SalaryFirstYearComponent implements OnInit {
          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[i];
+                this.remarkInfo = this.OtherCommissionList.filter((item)=>{
+                  return item.salaryCode == 'C-002' || item.Project_Id == '91E8A0DD-8696-9964-CD35-AEBA6C8FDF19';
+                });
              }else if(this.salaryType == 11 && (this.OtherCommissionList[i]['Project_Id'] == '45C0E205-653A-641B-1A35-C5C4148B1DA6' || this.OtherCommissionList[i]['salaryCode'] === 'C-001')){
-                this.remarkInfo = this.OtherCommissionList[i];
+                this.remarkInfo = this.OtherCommissionList.filter((item)=>{
+                  return item.salaryCode == 'C-001' || item.Project_Id == '45C0E205-653A-641B-1A35-C5C4148B1DA6';
+                });
              }else if(this.salaryType == 12 && (this.OtherCommissionList[i]['Project_Id'] == 'FC664684-4CBB-E3EC-FEC4-02FDDCAB4A02' || this.OtherCommissionList[i]['salaryCode'] === 'C-003')){
-                this.remarkInfo = this.OtherCommissionList[i];
+                this.remarkInfo = this.OtherCommissionList.filter((item)=>{
+                  return item.salaryCode == 'C-003' || item.Project_Id == 'FC664684-4CBB-E3EC-FEC4-02FDDCAB4A02';
+                });
              }else if(this.salaryType == 13 && (this.OtherCommissionList[i]['Project_Id'] == '105B9197-7B64-5AE6-AC47-C15AA857DDC5' || this.OtherCommissionList[i]['salaryCode'] === 'C-004')){
-                this.remarkInfo = this.OtherCommissionList[i];
+                this.remarkInfo = this.OtherCommissionList.filter((item)=>{
+                  return item.salaryCode == 'C-004' || item.Project_Id == '105B9197-7B64-5AE6-AC47-C15AA857DDC5';
+                });
              }else if(this.salaryType == 14 && (this.OtherCommissionList[i]['Project_Id'] == '12C24EDF-83D7-081C-AE2C-085031C4DCAF' || this.OtherCommissionList[i]['salaryCode'] === 'C-005')){
                //银盾在线佣金
                this.remarkInfo = this.OtherCommissionList[i];
                this.withdrawId = this.OtherCommissionList[i]['withdrawedId'];
                this.fortuneWithdrawListQuery()
              }else if(this.salaryType == 15 && this.OtherCommissionList[i]['salaryCode'] === 'C-006'){
-                this.remarkInfo = this.OtherCommissionList[i];
+                this.remarkInfo = this.OtherCommissionList.filter((item)=>{
+                  return item.salaryCode == 'C-006';
+                });
              }
            }
          }

--- a/src/app/my/salary/salary.component.html
+++ b/src/app/my/salary/salary.component.html
@@ -29,7 +29,7 @@
  <div id="salesContent" *ngIf="selectedId == 2">
    <div *ngIf="nowYear>2021">
-      <div class="salesItem" *ngFor="let historyPartItem of historyPart2" (click)="enterDetail(payScaleItem.years,payScaleItem.month,payScaleItem.loginName,payScaleItem.isBasic)">
+      <div class="salesItem" *ngFor="let historyPartItem of historyPart2" (click)="enterDetail(historyPartItem.years,historyPartItem.month,historyPartItem.loginName,historyPartItem.isBasic)">
        <div class="icon_bolck" style="top: 16px;"><span class="iconfont icon-xinzidan"></span></div>
        <div style="padding-right: 20px;">
          <div class="line">