From ef2306076f218e3a681a6bd207c068c9878462b0 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 30 Jun 2025 11:43:47 +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

---
 .../models/yuthon_onboard_approval.py         |  7 ++++++-
 .../views/yuthon_onboard_approval_views.xml   | 19 +++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
index ac7696cb8..0e77b4647 100644
--- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
@@ -29,7 +29,6 @@ class YuthonOnboardApproval(models.Model):
     account = fields.Char(string='账号')
     reason = fields.Text(string="正文")
     work_end = fields.Boolean(string="结束")
-    employee_id = fields.Many2one('hr.employee', string="员工姓名")
     bank = fields.Char(string='开户行')
     onboarding_status = fields.Selection([('none', '待入职'), ('onboarding', '已入职')], string='审批后员工状态', default='none')
     onboard_time = fields.Date(string='入职时间', default=fields.Datetime.now)
@@ -56,6 +55,12 @@ class YuthonOnboardApproval(models.Model):
                                      default='normal')
     active = fields.Boolean('Active', default=True, tracking=True)
 
+    party_id = fields.Many2one('yuthon.party.setting', string='甲方(用人单位)')
+    representatives = fields.Char(related='party_id.representatives', string='法定代表人或委托代理人')
+    economy_type = fields.Char(related='party_id.economy_type', string='经济类型')
+    address = fields.Text(related='party_id.address', string='通讯地址')
+
+
     def _get_default_name_title(self):
         return self._description if self._description else self._name
 
diff --git a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
index 6e3de5319..278d237eb 100644
--- a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
@@ -49,19 +49,18 @@
                         <field name="name" required="1"/>
                         <field name="work_end" invisible="1"/>
                         <field name="users_id"/>
+                        <field name="department_id" invisible="1"/>
+                        <field name="contracted_status"/>
+                        <field name="onboarding_status"/>
+                        <field name="is_office"/>
                         <field name="reason"/>
                         <field name="issues_result" invisible="is_issues == False"/>
                     </group>
-                    <group col="2" string="甲方信息">
-                        <group>
-                            <field name="employee_id" widget="ztree_select"/>
-                            <field name="onboarding_status"/>
-                        </group>
-                        <group>
-                            <field name="department_id" invisible="1"/>
-                            <field name="contracted_status"/>
-                            <field name="is_office"/>
-                        </group>
+                    <group string="甲方信息">
+                        <field name="party_id"/>
+                        <field name="representatives"/>
+                        <field name="economy_type"/>
+                        <field name="address"/>
                     </group>
                     <group col="3" string="乙方信息">
                         <group>