Commit 0bd257a2 by Sweet Zhang

历史薪资isHistory传1

parent f7d43c34
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from "@angular/router"; import { ActivatedRoute } from "@angular/router";
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { debug } from 'console';
import { MyService } from '../my.service'; import { MyService } from '../my.service';
@Component({ @Component({
......
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
<div class="price" *ngIf="!payScaleItem.pdfOssPath">¥{{payScaleItem.monDtlRAmount | number: "1.2-2"}}</div> <div class="price" *ngIf="!payScaleItem.pdfOssPath">¥{{payScaleItem.monDtlRAmount | number: "1.2-2"}}</div>
</div> </div>
</div> </div>
<div class="iconfont icon-ar-r" <div class="iconfont icon-ar-r"
style="width: 20px;height: 20px;position: absolute;right: 2px;top: 23px;"></div> style="width: 20px;height: 20px;position: absolute;right: 2px;top: 23px;"></div>
</div> </div>
<div style="text-align: center;margin-top: 20px;" *ngIf="payScaleInfos?.length<=0">暂无数据</div> <div style="text-align: center;margin-top: 20px;" *ngIf="payScaleInfos?.length<=0">暂无数据</div>
</div> </div>
<div id="salesContent" *ngIf="selectedId == 2"> <div id="salesContent" *ngIf="selectedId == 1">
<div *ngIf="nowYear>2021"> <div *ngIf="nowYear>2021">
<div class="salesItem" *ngFor="let historyPartItem of historyPart2" (click)="enterDetail(historyPartItem.years,historyPartItem.month,historyPartItem.loginName,historyPartItem.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 class="icon_bolck" style="top: 16px;"><span class="iconfont icon-xinzidan"></span></div>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<div class="price">¥{{historyPartItem.monDtlRAmount | number: "1.2-2"}}</div> <div class="price">¥{{historyPartItem.monDtlRAmount | number: "1.2-2"}}</div>
</div> </div>
</div> </div>
<div class="iconfont icon-ar-r" <div class="iconfont icon-ar-r"
style="width: 20px;height: 20px;position: absolute;right: 2px;top: 23px;"></div> style="width: 20px;height: 20px;position: absolute;right: 2px;top: 23px;"></div>
</div> </div>
</div> </div>
...@@ -79,4 +79,4 @@ ...@@ -79,4 +79,4 @@
</div> </div>
<ydlife-toast *ngIf="toastDialog" [toastInfo]="toastInfo"></ydlife-toast> <ydlife-toast *ngIf="toastDialog" [toastInfo]="toastInfo"></ydlife-toast>
\ No newline at end of file
...@@ -33,7 +33,7 @@ export class SalaryComponent implements OnInit { ...@@ -33,7 +33,7 @@ export class SalaryComponent implements OnInit {
this.payScaleListQuery(); this.payScaleListQuery();
this.tabList = [ this.tabList = [
{name:`${this.nowYear}年`,id:0}, {name:`${this.nowYear}年`,id:0},
{name:'历史薪资',id:2} {name:'历史薪资',id:1}
] ]
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment