!3098 !3097 添加功能

Merge pull request !3098 from 李鹏宇/dev
2025-06-05 02:26:59 +00:00
parent 3f135254b3 33ad4c9ae0
commit 552e31f4fd
1 changed files with 8 additions and 2 deletions
@@ -138,6 +138,13 @@ class SalaryComputeWizard(models.Model):
                        '工龄工资': 'seniority_salary',
                        '工会会费': 'union_dues',
                    }
+                    # 提前获取基本工资的原始值（处理前）
+                    base_salary_original = 0
+                    for line in internship_id.line_ids:
+                        if line.name == '基本工资':
+                            base_salary_original = line.total
+                            break
+
                    for line in internship_id.line_ids:
                        if line.name in target_names:
                            field_name = target_names[line.name]
@@ -160,8 +167,7 @@ class SalaryComputeWizard(models.Model):
                                else:
                                    result = rounded_value * 0.8 * internship_days / days
                            elif field_name == 'union_dues':  # 单独处理工会会费
-                                base_salary = getattr(internship_id, 'base_salary', 0)
-                                result = base_salary / 0.8 * 0.05
+                                result = base_salary_original * 0.05
                            else:
                                if work_days != days:
                                    result = line.total * 0.8 * internship_days / days + line.total * work_days / days