5月薪资显示&银盾在线佣奖类型添加佣金类型、经纪人、保单号

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

@@ -97,50 +97,37 @@ export class SalaryDetailComponent implements OnInit {
               //   }, 3000);
               //   }, 3000);
               //   return;
               //   return;
               // }
               // }
-              // this.month = this.payScaleInfos[i+1]['month'];
-              // this.years = this.payScaleInfos[i+1]['years'];
-              if(this.payScaleInfos[i+1]['pdfOssPath']){
-                window.open(this.payScaleInfos[i+1]['pdfOssPath']);
+              if(this.payScaleInfos[i+1]['month'] <5 && this.years == 2021){
+                if(this.payScaleInfos[i+1]['pdfOssPath']){
+                    window.open(this.payScaleInfos[i+1]['pdfOssPath']);
+                  }else{
+                    const toast = ToastService.show('暂无薪资单！', 0);
+                    setTimeout(() => {
+                      ToastService.hide();
+                    }, 3000);
+                    return;
+                  }
               }else{
               }else{
-                  const toast = ToastService.show('暂无薪资单！', 0);
-                  setTimeout(() => {
-                    ToastService.hide();
-                  }, 3000);
-                  return;
+                this.month = this.payScaleInfos[i+1]['month'];
+                this.years = this.payScaleInfos[i+1]['years'];
+                this.lifeCommonService.setTitle(`${this.years}年${this.month}月本期实发佣金`);
+                this.initSalay();
               }
               }
-              // this.lifeCommonService.setTitle(`${this.years}年${this.month}月本期实发佣金`);
-              // this.initSalay();
               break;
               break;
             }
             }
             //下一期
             //下一期
             if(type == 'next'){
             if(type == 'next'){
-              // if(i == 0){
-              //   const toast = ToastService.show('已到最后一期薪资！', 0);
-              //   setTimeout(() => {
-              //     ToastService.hide();
-              //   }, 3000);
-              //   return;
-              // }
-              // this.month = this.payScaleInfos[i-1]['month'];
-              // this.years = this.payScaleInfos[i-1]['years'];
-              if(i==0){
-                  const toast = ToastService.show('已到最后一期薪资！', 0);
-                  setTimeout(() => {
-                    ToastService.hide();
-                  }, 3000);
-                  return;
-              }
-              if(this.payScaleInfos[i-1]['pdfOssPath']){
-                window.open(this.payScaleInfos[i-1]['pdfOssPath']);
-              }else{
-                  const toast = ToastService.show('暂无薪资单！', 0);
-                  setTimeout(() => {
-                    ToastService.hide();
-                  }, 3000);
-                  return;
+              if(i == 0){
+                const toast = ToastService.show('已到最后一期薪资！', 0);
+                setTimeout(() => {
+                  ToastService.hide();
+                }, 3000);
+                return;
               }
               }
-              // this.lifeCommonService.setTitle(`${this.years}年${this.month}月本期实发佣金`);
-              // this.initSalay();
+              this.month = this.payScaleInfos[i-1]['month'];
+              this.years = this.payScaleInfos[i-1]['years'];
+              this.lifeCommonService.setTitle(`${this.years}年${this.month}月本期实发佣金`);
+              this.initSalay();
               break;
               break;
             }
             }
           }
           }

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

@@ -67,10 +67,13 @@
               <span>投保人：{{customerFortuneItem.holderName}}</span>
               <span>投保人：{{customerFortuneItem.holderName}}</span>
             </div>
             </div>
             <div style="font-size: 14px;color: #b3b3b3;">
             <div style="font-size: 14px;color: #b3b3b3;">
-              <span>申请日期：{{customerFortuneItem.withdrawDate}}</span>
+              <span>保单号：{{customerFortuneItem.policyNo}}</span>
             </div>
             </div>
             <div style="font-size: 14px;color: #b3b3b3;">
             <div style="font-size: 14px;color: #b3b3b3;">
-              <span>发放日期：{{customerFortuneItem.payDate}}</span>
+              <span>经纪人：{{customerFortuneItem.name}}</span>
+            </div>
+            <div style="font-size: 14px;color: #b3b3b3;">
+              <span>佣金类型：{{customerFortuneItem.commissionType}}</span>
             </div>
             </div>
             <div style="font-size: 14px;color: #b3b3b3;">
             <div style="font-size: 14px;color: #b3b3b3;">
               <span>备注：{{remarkInfo?.Comments}}</span>
               <span>备注：{{remarkInfo?.Comments}}</span>

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

@@ -36,11 +36,11 @@ export class SalaryComponent implements OnInit {
       if (res['success']) {
       if (res['success']) {
         if(this.selectedId == 0){
         if(this.selectedId == 0){
           this.payScaleInfos = res['data']['payScaleInfos'].filter((item)=>{
           this.payScaleInfos = res['data']['payScaleInfos'].filter((item)=>{
-            return item.years == 2021 && item.month == 6
+            return (item.years == 2021 && item.month == 6) || (item.years == 2021 && item.month == 5)
           });
           });
         }else{
         }else{
           this.payScaleInfos = res['data']['payScaleInfos'].filter((item)=>{
           this.payScaleInfos = res['data']['payScaleInfos'].filter((item)=>{
-            return item.monDtlPeriod != '2021-06'
+            return item.monDtlPeriod != '2021-06' && item.monDtlPeriod != '2021-05'
           });
           });
         }
         }
       } else {
       } else {