薪资单佣奖类型计总

src/app/common/detail-modal/detail-modal.component.html

 <!--弹窗Starts-->
 <div class="detailContent defineFixed" *ngIf="isOpen">
   <!-- 其他应税项目模板-->
-  <div class="detailBox" *ngIf="application===1">
+  <div class="detailBox" *ngIf="application===2">
     <div class="header">
       <div></div>
       <h5>其他应税加扣款</h5>
@@ -10,7 +10,7 @@
   </div>
   <!-- 其他应税项目模板-->
   <!--个人所得税政策模板-->
-  <div class="detailBox" *ngIf="application===2">
+  <div class="detailBox" *ngIf="application===1">
     <div class="header">
       <div></div>
       <h5>个人所得税政策</h5>

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

@@ -22,6 +22,14 @@
           <span>续年度销售佣金</span>
           <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
         </div>
+        <div class="item_detail" (click)="jumpToFirstYearSales(2)">
+          <span>推介奖金</span>
+          <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
+        </div>
+        <div class="item_detail" (click)="jumpToFirstYearSales(2)">
+          <span>体系推介奖金</span>
+          <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
+        </div>
       </div>
       <div class="item">
         <div class="title">销售管理(B)</div>
@@ -33,17 +41,29 @@
           <span>续年度辅导奖金</span>
           <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
         </div>
+        <div class="item_detail" (click)="jumpToFirstYearSales(3)">
+          <span>首年度绩效奖金</span>
+          <span class="red">18,505.00 <i class="iconfont icon-ar-r"></i></span>
+        </div>
+        <div class="item_detail" (click)="jumpToFirstYearSales(4)">
+          <span>续年度绩效奖金</span>
+          <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
+        </div>
         <div class="item_detail" (click)="jumpToFirstYearSales(5)">
           <span>特别管理奖金</span>
           <span class="red">225.00 <i class="iconfont icon-ar-r"></i></span>
         </div>
       </div>
       <div class="item">
-        <div class="title" style="justify-content: inherit;" (click)="toastShow = true">
-          其他应税项目(C)
+        <div class="title" style="justify-content: inherit;" (click)="otherToastShow = true">
+          其他加扣款(C)
           <span class="iconfont icon-wenhao" style="margin-top: 3px;color: #f8002e;margin-left: 3px;"></span></div>
         <div class="item_detail" (click)="jumpToFirstYearSales(6)">
-          <span>其他应税加扣款</span>
+          <span>其他加扣款</span>
+          <span class="red">225.00<i class="iconfont icon-ar-r"></i></span>
+        </div>
+        <div class="item_detail" (click)="jumpToFirstYearSales(6)">
+          <span>加码奖</span>
           <span class="red">225.00<i class="iconfont icon-ar-r"></i></span>
         </div>
       </div>
@@ -70,12 +90,15 @@
         </div>
       </div>
     </div>
-    <a style="color:#2c67a0;" (click)="lookTak()">点击查看个人所得税明细</a>
+    <a style="color:#2c67a0;margin-left: 10px;" (click)="lookTak()">点击查看个人所得税明细</a>
   </div>
-  <!--保险公司介绍弹窗-->
-  <div *ngIf="toastShow">
+  <div *ngIf="taxToastShow">
     <ydlife-detail-modal [application]="1"
-      (closeDetailModal)="toastShow = false"></ydlife-detail-modal>
+      (closeDetailModal)="taxToastShow = false"></ydlife-detail-modal>
+  </div>
+  <div *ngIf="otherToastShow">
+    <ydlife-detail-modal [application]="2"
+      (closeDetailModal)="otherToastShow = false"></ydlife-detail-modal>
   </div>
 </div>
 <div class="mask" *ngIf="takFlag == true;"></div>
@@ -83,7 +106,7 @@
   <div class="close" (click)="takFlag = false;"> X </div>
   <div class="mask_title">
     <div>个人所得税预扣明细</div>
-    <div (click)="toastShow = true"><span class="iconfont icon-zhuyishixiang"></span> 个人所得税政策</div>
+    <div (click)="taxToastShow = true"><span class="iconfont icon-zhuyishixiang"></span> 个人所得税政策</div>
   </div>
   <div class="tax_content">
     <div class="tax_item">

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

@@ -30,14 +30,16 @@
     .content_wrapper{
         margin: 15px 10px 0;
         min-height: 100%;
+        padding-bottom: 10px;
         .part{
             margin-bottom: 10px;
             background: #fff;
             padding:0 10px;
             border-radius: 8px;
+            padding-bottom: 10px;
             .item{
                 border-bottom: 1px #f4f4f4 solid;
-                padding: 10px 0;
+                padding: 10px 0 0 0;
                 .title{
                     font-size: 15px;
                     display: flex;
@@ -67,6 +69,9 @@
                     font-size: 15px;
                 }
             }
+            .item:last-child{
+                border-bottom: none;
+            }
         }
         
     }

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

@@ -11,7 +11,8 @@ import { ActivatedRoute,Router } from "@angular/router";
 export class SalaryDetailComponent implements OnInit {
   monDtlPeriod:string;
   takFlag:boolean = false;
-  toastShow:boolean;
+  taxToastShow:boolean;
+  otherToastShow:boolean;
   constructor(public lifeCommonService: LifeCommonService,
     private activatedRoute: ActivatedRoute,
     private router:Router) { }

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

@@ -20,7 +20,7 @@
       <div class="money" (click)="status = !status">
         ￥3,750.00 
           <div style="width: 15px;height: 15px;position: absolute;right: -20px;top: 8px;" 
-          [ngStyle]="{'transform': status ? 'rotate(0)' : 'rotate(180deg)','top':status?'0':'8px'}">
+          [ngStyle]="{'transform': status ? 'rotate(180deg)' : 'rotate(0)','top':status?'8px':'0'}">
             <span class="iconfont icon-xiangxia" ></span>
           </div>
       </div>