保单信息职级率去掉&薪资单列表添加isActive入参

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

@@ -289,7 +289,7 @@ export class SalaryDetailComponent implements OnInit {
 
 
   //薪资单列表-》用来判断上一期下一期的加减
   //薪资单列表-》用来判断上一期下一期的加减
   payScaleListQuery() {
   payScaleListQuery() {
-    this.myService.payScaleListQuery({practitionerId:this.practitionerId,isHistory: 2}).subscribe((res) => {
+    this.myService.payScaleListQuery({practitionerId:this.practitionerId,isHistory: 2,isActive:this.isPreSalary?null:1}).subscribe((res) => {
       if (res['success']) {
       if (res['success']) {
         this.payScaleInfos = res['data']['payScaleInfos'];
         this.payScaleInfos = res['data']['payScaleInfos'];
       }
       }

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

@@ -14,7 +14,7 @@
         <div                                                                                                                                                                                                                                                                                                                                                                                                   
         <div                                                                                                                                                                                                                                                                                                                                                                                                   
         *ngIf="policyItem.status">保费：{{policyItem.YearPREMIUM | number: "1.2-2"}}</div>
         *ngIf="policyItem.status">保费：{{policyItem.YearPREMIUM | number: "1.2-2"}}</div>
         <div *ngIf="policyItem.status">FYC/RYC：{{policyItem['FYC/RYC'] | number: "1.2-2"}}</div>
         <div *ngIf="policyItem.status">FYC/RYC：{{policyItem['FYC/RYC'] | number: "1.2-2"}}</div>
-        <div *ngIf="policyItem.status">职阶率：{{policyItem.Rate}}%</div>
+        <!-- <div *ngIf="policyItem.status">职阶率：{{policyItem.Rate}}%</div> -->
         <div *ngIf="policyItem.status">体系：{{policyItem.SaleSystem}}</div>
         <div *ngIf="policyItem.status">体系：{{policyItem.SaleSystem}}</div>
         <div *ngIf="policyItem.status">经纪人：{{policyItem.Salestaff}}</div>
         <div *ngIf="policyItem.status">经纪人：{{policyItem.Salestaff}}</div>
       </div>
       </div>
@@ -34,7 +34,7 @@
       <div class="line_item">
       <div class="line_item">
         <div>体系名称：{{systemItem.SaleSystem}}</div>
         <div>体系名称：{{systemItem.SaleSystem}}</div>
         <div>体系FYC/RYC：{{systemItem['FYC/RYC'] | number: "1.2-2"}}</div>
         <div>体系FYC/RYC：{{systemItem['FYC/RYC'] | number: "1.2-2"}}</div>
-        <div>佣金比率：{{systemItem.Rate}}%</div>
+        <div>佣奖比例：{{systemItem.Rate}}%</div>
       </div>
       </div>
       <div class="money" style="top: 30px;right: 10px;" *ngIf="isBasic==0">
       <div class="money" style="top: 30px;right: 10px;" *ngIf="isBasic==0">
         ￥{{(systemItem['FYC/RYC']) * (systemItem.Rate/100 ) | number: "1.2-2"}}
         ￥{{(systemItem['FYC/RYC']) * (systemItem.Rate/100 ) | number: "1.2-2"}}

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

@@ -38,7 +38,7 @@ export class SalaryComponent implements OnInit {
   }
   }
 
 
   payScaleListQuery() {
   payScaleListQuery() {
-    this.myService.payScaleListQuery({ practitionerId:this.practitionerId,isHistory: this.selectedId}).subscribe((res) => {
+    this.myService.payScaleListQuery({ practitionerId:this.practitionerId,isHistory: this.selectedId,isActive:1}).subscribe((res) => {
       if (res['success']) {
       if (res['success']) {
         if(this.selectedId == 0){
         if(this.selectedId == 0){
           if(this.nowYear == 2021){
           if(this.nowYear == 2021){