From 43bb03adb4411eb2ad1d5239979c1cd7b41dee62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Mon, 20 Apr 2026 16:15:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_employee/models/yuthon_hr_employee.py          | 2 +-
 yuthon_hr_employee/models/yuthon_medical_manage.py       | 6 ++++++
 yuthon_hr_employee/views/yuthon_hr_employee_views.xml    | 4 ++--
 yuthon_hr_employee/views/yuthon_medical_manage_views.xml | 3 ++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py
index eec20a72e..af39090d4 100644
--- a/yuthon_hr_employee/models/yuthon_hr_employee.py
+++ b/yuthon_hr_employee/models/yuthon_hr_employee.py
@@ -26,7 +26,7 @@ class YuthonHrEmployee(models.Model):
     对原模型数据的隐藏，字段的开发和添加
     """
     _inherit = "hr.employee"
-    _order = 'number asc'
+    _order = 'user_number asc'
 
     # name = fields.CharWithPinyin(default_export_compatible=True)
     user_role_ids_changed = fields.Boolean(string="xxx")  # bug
diff --git a/yuthon_hr_employee/models/yuthon_medical_manage.py b/yuthon_hr_employee/models/yuthon_medical_manage.py
index 96da05c47..c1ef030a6 100644
--- a/yuthon_hr_employee/models/yuthon_medical_manage.py
+++ b/yuthon_hr_employee/models/yuthon_medical_manage.py
@@ -9,6 +9,12 @@ class YuthonMedicalManage(models.Model):
     _description = '体检费管理'
 
     employee_id = fields.Many2one('hr.employee', string="员工姓名")
+    employee_number = fields.Char(
+        string='序号',
+        related='employee_id.user_number',
+        store=True,
+        readonly=True
+    )
     start_date = fields.Date(string='开始日期')
     year = fields.Char(string="年份")
     current_year_remaining = fields.Float(string="本年剩余", compute="_compute_current_year_remaining")
diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index f1e3cc025..918c6de40 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -221,7 +221,7 @@
                 <attribute name="options">"{'no_create': True, 'no_open': True}"</attribute>
             </xpath>
             <xpath expr="//field[@name='job_id']" position="after">
-                <field name="number"/>
+                <field name="number" invisible="1"/>
                 <field name="user_number"/>
                 <field name="contract_type_id" options="{'no_open': True}"/>
             </xpath>
@@ -512,7 +512,7 @@
                       decoration-info="end_comparison == 'blue'"
                       decoration-danger="end_comparison == 'red'"
                       decoration-warning="end_comparison == 'yellow'"
-                      default_order="entry_date asc">
+                      default_order="user_number asc">
                     <header>
                     </header>
                     <field name="end_comparison" column_invisible="1"/>
diff --git a/yuthon_hr_employee/views/yuthon_medical_manage_views.xml b/yuthon_hr_employee/views/yuthon_medical_manage_views.xml
index d81049f01..02640685e 100644
--- a/yuthon_hr_employee/views/yuthon_medical_manage_views.xml
+++ b/yuthon_hr_employee/views/yuthon_medical_manage_views.xml
@@ -4,13 +4,14 @@
         <field name="name">yuthon.medical.manage.tree</field>
         <field name="model">yuthon.medical.manage</field>
         <field name="arch" type="xml">
-            <tree string="体检费管理" editable="bottom" default_order="entry_date desc">
+            <tree string="体检费管理" editable="bottom" default_order="employee_number asc">
                 <header>
                     <button name="property_reimbursement_form" string="提交体检费报销审批" type="object"
                             class="oe_highlight"/>
                     <button name="compute_medical_manage" string="重新计算" type="object"
                             class="oe_highlight"/>
                 </header>
+                <field name="employee_number" column_invisible="1"/>
                 <field name="employee_id" options="{'no_create': True}"/>
                 <field name="year" column_invisible="1"/>
                 <!--                <field name="company_id" required="1" optional="show"/>-->