Skip to content

Y
ydLife
Commit e4eaa446 by sunchao
Options

Merge branch 'dev' into master

parents a652481f 73b0487c
Showing with 36 additions and 43 deletions
src/app/my/salary-detail/salary-detail.component.ts
...@@ -87,7 +87,7 @@ export class SalaryDetailComponent implements OnInit { ...@@ -87,7 +87,7 @@ 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) && ( Number(this.payScaleInfos[i]['month']) == this.month)){
//上一期 //上一期
if(type=='pre'){ if(type=='pre'){
// if(i==this.payScaleInfos.length-1){ // if(i==this.payScaleInfos.length-1){
...@@ -97,50 +97,37 @@ export class SalaryDetailComponent implements OnInit { ...@@ -97,50 +97,37 @@ export class SalaryDetailComponent implements OnInit {
// }, 3000); // }, 3000);
// return; // return;
// } // }
// this.month = this.payScaleInfos[i+1]['month']; if(this.payScaleInfos[i+1]['month'] <5 && this.years == 2021){
// this.years = this.payScaleInfos[i+1]['years']; if(this.payScaleInfos[i+1]['pdfOssPath']){
if(this.payScaleInfos[i+1]['pdfOssPath']){ window.open(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); this.month = this.payScaleInfos[i+1]['month'];
setTimeout(() => { this.years = this.payScaleInfos[i+1]['years'];
ToastService.hide(); this.lifeCommonService.setTitle(`${this.years}年${this.month}月本期实发佣金`);
}, 3000); this.initSalay();
return;
} }
// 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.lifeCommonService.setTitle(`${this.years}年${this.month}月本期实发佣金`); this.month = this.payScaleInfos[i-1]['month'];
// this.initSalay(); this.years = this.payScaleInfos[i-1]['years'];
this.lifeCommonService.setTitle(`${this.years}年${this.month}月本期实发佣金`);
this.initSalay();
break; break;
} }
} }
...@@ -225,7 +212,7 @@ export class SalaryDetailComponent implements OnInit { ...@@ -225,7 +212,7 @@ export class SalaryDetailComponent implements OnInit {
//薪资单列表-》用来判断上一期下一期的加减 //薪资单列表-》用来判断上一期下一期的加减
payScaleListQuery() { payScaleListQuery() {
this.myService.payScaleListQuery({ practitionerIdEG: this.practitionerIdEG,practitionerId:this.practitionerId,isHistory: 2}).subscribe((res) => { this.myService.payScaleListQuery({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-first-year/salary-first-year.component.html
...@@ -67,10 +67,16 @@ ...@@ -67,10 +67,16 @@
<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.orderPrice | number:'1.2-2'}}</span>
</div>
<div style="font-size: 14px;color: #b3b3b3;">
<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 { ...@@ -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 {
......
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