From a341d0d442c8ffbaa0ef4720feea3967535da130 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 28 Jul 2025 15:36:29 +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/views/yuthon_hr_employee_views.xml |  4 +++-
 .../models/hr_employee_page.py                        | 11 ++++++-----
 .../models/yuthon_message_login.py                    |  2 +-
 .../views/yuthon_message_login_views.xml              |  5 +++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index 2689e364b..293a133b7 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -243,7 +243,9 @@
                             <field name="name_school"/>
                             <field name="start_date"/>
                             <field name="end_date"/>
-                            <field name="part_time_degree"/>
+                            <field name="part_time_diploma"/>
+                            <field name="Part_time_degree"/>
+                            <field name="full_time_diploma"/>
                             <field name="full_time_degree"/>
                             <field name="professional"/>
                             <field name="documents_ids" widget="preview_many2many"/>
diff --git a/yuthon_hr_employee_approval/models/hr_employee_page.py b/yuthon_hr_employee_approval/models/hr_employee_page.py
index 5c15fd32a..95c785be8 100644
--- a/yuthon_hr_employee_approval/models/hr_employee_page.py
+++ b/yuthon_hr_employee_approval/models/hr_employee_page.py
@@ -8,7 +8,7 @@ class HrYuthonEmergencyContactLine(models.Model):
     employee_id = fields.Many2one('hr.employee', string="关联员工")
     message_login_id = fields.Many2one('yuthon.message.login', string="关联信息登记")
     name = fields.Char(string="姓名")
-    user_relationship = fields.Selection([("parents", "父母"), ("children", "子女"), ("spouse", "配偶"), ("spouse", "其他")], string="关系")
+    user_relationship = fields.Selection([("father", "父子"), ("porters", "父女"), ("mother", "母子"), ('daughter', '母女'), ("spouse", "其他")], string="关系")
     workplace = fields.Char(string="工作单位")
     post = fields.Char(string="岗位")
     phone_number = fields.Char(string="手机号")
@@ -39,8 +39,10 @@ class HrYuthonEducationExperienceLine(models.Model):
     end_date = fields.Date(string="毕业时间")
     in_school_duties = fields.Char(string="在校职务")
     professional = fields.Char(string="专业")
-    Part_time_degree = fields.Char(string="非全日制学历学位")
-    full_time_degree = fields.Char(string="全日制学历学位")
+    part_time_diploma = fields.Char(string="非全日制学历")
+    Part_time_degree = fields.Char(string="非全日制学位")
+    full_time_degree = fields.Char(string="全日制学位")
+    full_time_diploma = fields.Char(string="全日制学历")
     major_courses = fields.Char(string="主修课程")
 
 
@@ -63,8 +65,7 @@ class HrYuthonDirectlyDetailLines(models.Model):
 
     message_login_id = fields.Many2one('yuthon.message.login', string="关联信息登记")
     name = fields.Char(string='姓名')
-    relational = fields.Selection([("parents", "父母"), ("children", "子女"),
-                                   ("spouse", "配偶"), ("spouse", "其他")], string="关系")
+    relational = fields.Selection([("father", "父子"), ("porters", "父女"), ("mother", "母子"), ('daughter', '母女'), ("spouse", "其他")], string="关系")
     workplace = fields.Char(string='工作单位及职务')
     phone = fields.Char(string='联系电话')
 
diff --git a/yuthon_hr_employee_approval/models/yuthon_message_login.py b/yuthon_hr_employee_approval/models/yuthon_message_login.py
index 7a70a0494..6f4b88c59 100644
--- a/yuthon_hr_employee_approval/models/yuthon_message_login.py
+++ b/yuthon_hr_employee_approval/models/yuthon_message_login.py
@@ -28,7 +28,7 @@ class YuthonMessageLogin(models.Model):
     code = fields.Char(string="编号",
                        default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_message_login_code'))
     users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
-    department_id = fields.Many2one('hr.department', string='部门')
+    department_id = fields.Many2one('hr.department', string='部门', related='users_id.employee_id.department_id')
     staff_name = fields.Char(string='姓名')
     sex = fields.Selection([('male', '男'), ('female', '女')], string='性别')
     date_birth = fields.Date(string='出生年月')
diff --git a/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml b/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml
index b5fcbb506..b5a9219f5 100644
--- a/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml
@@ -56,7 +56,7 @@
                         <group>
                             <field name="staff_name" required="1"/>
                             <field name="users_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
+                            <field name="department_id"/>
                             <field name="sex"/>
                             <field name="work_end" invisible="1"/>
                             <field name="date_birth"/>
@@ -128,10 +128,11 @@
                                     <field name="name_school"/>
                                     <field name="start_date"/>
                                     <field name="end_date"/>
+                                    <field name="part_time_diploma"/>
                                     <field name="Part_time_degree"/>
+                                    <field name="full_time_diploma"/>
                                     <field name="full_time_degree"/>
                                     <field name="professional"/>
-                                    <field name="major_courses"/>
                                 </tree>
                             </field>
                         </page>