添加功能

yuthon_hr_employee/models/yuthon_hr_employee.py

@@ -169,9 +169,9 @@ class YuthonHrEmployee(models.Model):
     salary_group_id = fields.Many2one('yuthon.salary.group', string="工资单分组", store=True)
     last_year_salary = fields.Float(string="年金基数")
     converted = fields.Float(string="折算实际系数")
-    conversion_factor = fields.Float(string="2024年有效计算")
+    conversion_factor = fields.Float(string="上年有效计算")
     total_coefficients = fields.Float(string="系数合计", compute='_compute_total_coefficients', store=True)
-    calculation_totals = fields.Float(string="有效计算合计", compute='_compute_calculation_totals', store=True)
+    calculation_totals = fields.Float(string="有效计算合计", compute='_compute_total_coefficients', store=True)
     efficient_calculations = fields.Float(string="有效计算")
     social_base_on = fields.Float(string="1-6月社保薪资基数")
     social_base_off = fields.Float(string="7-12月社保薪资基数")
@@ -192,17 +192,8 @@ class YuthonHrEmployee(models.Model):
     @api.depends('converted')
     def _compute_total_coefficients(self):
         for record in self:
-            company_employees = self.env['hr.employee'].search([
-                ('company_id', '=', record.company_id.id)
-            ])
+            company_employees = self.env['hr.employee'].search([])
             record.total_coefficients = sum(employee.converted for employee in company_employees)
-
-    @api.depends('conversion_factor')
-    def _compute_calculation_totals(self):
-        for record in self:
-            company_employees = self.env['hr.employee'].search([
-                ('company_id', '=', record.company_id.id)
-            ])
             record.calculation_totals = sum(employee.conversion_factor for employee in company_employees)
 
     @api.depends('contract_id')

yuthon_hr_employee/views/yuthon_hr_employee_views.xml

@@ -164,8 +164,8 @@
                     </group>
                     <group>
                         <field name="converted"/>
+                        <field name="conversion_factor"/>
                         <field name="total_coefficients"/>
-                        <field name="conversion_factor" options="{'no_create': True}"/>
                         <field name="calculation_totals"/>
                     </group>
                 </group>