Commit 0e7481dc by sunchao

Merge branch 'dev' into master

parents e19ff620 d7556d74
...@@ -174,7 +174,7 @@ export class SalaryDetailComponent implements OnInit { ...@@ -174,7 +174,7 @@ export class SalaryDetailComponent implements OnInit {
this.recommendAward = this.salaryDetailsList[i]; this.recommendAward = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === 'DDCCD63D-EE47-5953-8CA0-CFAA83CB9A5E'){ }else if(this.salaryDetailsList[i]['project_id'] === 'DDCCD63D-EE47-5953-8CA0-CFAA83CB9A5E'){
this.systemRecommendAward = this.salaryDetailsList[i]; this.systemRecommendAward = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === 'A09E7626-B77C-79A0-CC93-D929BCBB7B35'){ }else if(this.salaryDetailsList[i]['project_id'] === 'A09E7626-B77C-79A0-CC93-D929BCBB7B35' || this.salaryDetailsList[i]['project_id'] === '871C458C-CF54-F2A6-589F-EFEE1EE16B25'){
this.specialManagementAward = this.salaryDetailsList[i]; this.specialManagementAward = this.salaryDetailsList[i];
}else if(this.salaryDetailsList[i]['project_id'] === '91E8A0DD-8696-9964-CD35-AEBA6C8FDF19'){ }else if(this.salaryDetailsList[i]['project_id'] === '91E8A0DD-8696-9964-CD35-AEBA6C8FDF19'){
this.otherPreTaxDeduction = this.salaryDetailsList[i]; this.otherPreTaxDeduction = this.salaryDetailsList[i];
......
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