Skip to content

Y
ydLife
Commit ce7899f4 by sunchao
Options

薪资单2021年只显示6月

parent ddd51274
Showing with 60 additions and 33 deletions
src/app/my/application-process/employee-education/employee-education.component.html
...@@ -43,4 +43,4 @@ ...@@ -43,4 +43,4 @@
</div> </div>
</div> </div>
<ydlife-toast *ngIf="toastDialog" [toastInfo]="toastInfo"></ydlife-toast> <ydlife-toast *ngIf="toastDialog" [toastInfo]="toastInfo"></ydlife-toast>
<ydlife-alert *ngIf="isNeedAlert" [dialogInfo]="dialogInfo" (popInfo)="getPopInfo()"></ydlife-alert> <ydlife-alert *ngIf="isNeedAlert" [dialogInfo]="dialogInfo" (popInfo)="getPopI
\ No newline at end of file
src/app/my/salary-detail/salary-detail.component.html
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<span (click)="otherTaxFlag = true">代扣个人所得税/增值税/附加税(D)<span class="iconfont icon-wenhao" style="margin-top: 3px;color: #f8002e;margin-left: 3px;"></span></span> <span (click)="otherTaxFlag = true">代扣个人所得税/增值税/附加税(D)<span class="iconfont icon-wenhao" style="margin-top: 3px;color: #f8002e;margin-left: 3px;"></span></span>
<span class="red">{{deduction | number: "1.2-2" }}</span> <span class="red">{{deduction | number: "1.2-2" }}</span>
</div> </div>
<a style="color:#2c67a0;" (click)="lookTak()">点击查看个人所得税明细</a> <!-- <a style="color:#2c67a0;" (click)="lookTak()">点击查看个人所得税明细</a> -->
</div> </div>
</div> </div>
<div class="part"> <div class="part">
......
src/app/my/salary-detail/salary-detail.component.ts
...@@ -87,36 +87,60 @@ export class SalaryDetailComponent implements OnInit { ...@@ -87,36 +87,60 @@ export class SalaryDetailComponent implements OnInit {
querySalaryDetail(type){ querySalaryDetail(type){
if(type!=null){ if(type!=null){
for(let i=0;i<this.payScaleInfos.length;i++){ for(let i=0;i<this.payScaleInfos.length;i++){
if(this.payScaleInfos[i]['years'] == this.years && this.payScaleInfos[i]['month'] == this.month){ if(this.payScaleInfos[i]['years'] == this.years && this.payScaleInfos[i]['month'] == this.month){
//上一期 //上一期
if(type=='pre'){ if(type=='pre'){
if(i==this.payScaleInfos.length-1){ // if(i==this.payScaleInfos.length-1){
const toast = ToastService.show('已到第一期薪资！', 0); // const toast = ToastService.show('已到第一期薪资！', 0);
setTimeout(() => { // setTimeout(() => {
ToastService.hide(); // ToastService.hide();
}, 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']);
}else{
const toast = ToastService.show('暂无薪资单！', 0);
setTimeout(() => {
ToastService.hide();
}, 3000);
return;
} }
this.month = this.payScaleInfos[i+1]['month']; // this.lifeCommonService.setTitle(`${this.years}年${this.month}月本期实发佣金`);
this.years = this.payScaleInfos[i+1]['years']; // this.initSalay();
this.lifeCommonService.setTitle(`${this.years}年${this.month}月本期实发佣金`);
this.initSalay();
break; break;
} }
//下一期 //下一期
if(type == 'next'){ if(type == 'next'){
if(i == 0){ // if(i == 0){
const toast = ToastService.show('已到最后一期薪资！', 0); // const toast = ToastService.show('已到最后一期薪资！', 0);
setTimeout(() => { // setTimeout(() => {
ToastService.hide(); // ToastService.hide();
}, 3000); // }, 3000);
return; // 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;
} }
this.month = this.payScaleInfos[i-1]['month']; // this.lifeCommonService.setTitle(`${this.years}年${this.month}月本期实发佣金`);
this.years = this.payScaleInfos[i-1]['years']; // this.initSalay();
this.lifeCommonService.setTitle(`${this.years}年${this.month}月本期实发佣金`);
this.initSalay();
break; break;
} }
} }
...@@ -201,7 +225,7 @@ export class SalaryDetailComponent implements OnInit { ...@@ -201,7 +225,7 @@ export class SalaryDetailComponent implements OnInit {
//薪资单列表-》用来判断上一期下一期的加减 //薪资单列表-》用来判断上一期下一期的加减
payScaleListQuery() { payScaleListQuery() {
this.myService.payScaleListQuery({ practitionerIdEG: this.practitionerIdEG,practitionerId:this.practitionerId,isHistory: 0}).subscribe((res) => { this.myService.payScaleListQuery({ practitionerIdEG: this.practitionerIdEG,practitionerId:this.practitionerId,isHistory: 2}).subscribe((res) => {
if (res['success']) { if (res['success']) {
this.payScaleInfos = res['data']['payScaleInfos']; this.payScaleInfos = res['data']['payScaleInfos'];
} }
......
src/app/my/salary/salary.component.html
...@@ -27,16 +27,12 @@ ...@@ -27,16 +27,12 @@
<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 == 1"> <div id="salesContent" *ngIf="selectedId == 2">
<div class="salesItem" *ngFor="let payScaleItem of payScaleInfos" (click)="getPdf(payScaleItem.monShId,payScaleItem.pdfOssPath)"> <div class="salesItem" *ngFor="let payScaleItem of payScaleInfos" (click)="getPdf(payScaleItem.monShId,payScaleItem.pdfOssPath)">
<div class="icon_bolck"><span class="iconfont icon-xinzidan"></span></div> <div class="icon_bolck"><span class="iconfont icon-xinzidan"></span></div>
<div class="line"> <div class="line">
<div>薪资日期</div> <div>薪资日期</div>
<div>{{lifeCommonService.getDate(payScaleItem.monDtlPeriod)}}</div> <div>{{payScaleItem.years}}年{{payScaleItem.month}}月</div>
</div>
<div class="line">
<div>流水编号</div>
<div>{{payScaleItem.monShId}}</div>
</div> </div>
<div class="line"> <div class="line">
<span>应发佣金</span> <span>应发佣金</span>
......
src/app/my/salary/salary.component.ts
...@@ -27,14 +27,22 @@ export class SalaryComponent implements OnInit { ...@@ -27,14 +27,22 @@ export class SalaryComponent implements OnInit {
this.payScaleListQuery(); this.payScaleListQuery();
this.tabList = [ this.tabList = [
{name:'2021年',id:0}, {name:'2021年',id:0},
{name:'历史薪资',id:1} {name:'历史薪资',id:2}
] ]
} }
payScaleListQuery() { payScaleListQuery() {
this.myService.payScaleListQuery({ practitionerId:this.practitionerId,isHistory: this.selectedId}).subscribe((res) => { this.myService.payScaleListQuery({ practitionerId:this.practitionerId,isHistory: this.selectedId}).subscribe((res) => {
if (res['success']) { if (res['success']) {
this.payScaleInfos = res['data']['payScaleInfos']; if(this.selectedId == 0){
this.payScaleInfos = res['data']['payScaleInfos'].filter((item)=>{
return item.years == 2021 && item.month == 6
});
}else{
this.payScaleInfos = res['data']['payScaleInfos'].filter((item)=>{
return item.monDtlPeriod != '2021-06'
});
}
} else { } else {
this.payScaleInfos = []; this.payScaleInfos = [];
} }
......
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