!9570 !9568 添加功能

Merge pull request !9570 from 李鹏宇/dev
2026-03-11 02:51:27 +00:00
parent a9ce8f8357 871e093935
commit bbfe74d9f2
2 changed files with 3 additions and 1 deletions
@@ -367,6 +367,8 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                        )
                        if employee:
                            return employee
+                    elif button.specify_field_id.relation == 'hr.employee':
+                        return field_value
                    else:
                        department_domain = ['|', ('department_id', '=', field_value.id),
                                             ('department_ids', 'in', field_value.id)]
@@ -46,8 +46,8 @@
        <field name="model">hr.leave</field>
        <field name="arch" type="xml">
            <search string="请假情况">
-                <field name="caption"/>
                <field name="employee_id"/>
+                <field name="caption"/>
                <filter string="员工" name="group_by_employee_id" domain="[]" context="{'group_by': 'employee_id'}"/>
                <filter name="now_month" string="当月"  domain="[('date_from', '&gt;=', (context_today() + relativedelta(day=1)).strftime('%Y-%m-%d')),
                        ('date_from', '&lt;', (context_today() + relativedelta(months=+1, day=1)).strftime('%Y-%m-%d'))]"/>