From 23992656e024c6f290dcf0ae72299193bb3e6d14 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Wed, 4 Jun 2025 15:17:37 +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

---
 .../views/yuthon_leaving_approval_views.xml                   | 4 ++--
 yuthon_maintain/models/property_report_repair.py              | 1 -
 yuthon_maintain/views/property_report_repair.xml              | 2 +-
 yuthon_salary/views/inherit_hr_payslip_views.xml              | 1 +
 yuthon_will_task/views/yuthon_will_task_views.xml             | 2 --
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
index 33218be96..2da9006e5 100644
--- a/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
@@ -50,7 +50,7 @@
                     <group string="离职信息" col="3">
                         <group>
                             <field name="employee_id"/>
-                            <field name="department_id" widget="ztree_select"/>
+                            <field name="department_id"/>
                               <field name="departure_type"/>
                         </group>
                         <group>
@@ -102,7 +102,7 @@
         </field>
     </record>
     <record id="yuthon_leaving_approval_action" model="ir.actions.act_window">
-        <field name="name">员工辞职</field>
+        <field name="name">离职申请</field>
         <field name="res_model">yuthon.leaving.approval</field>
         <field name="view_mode">tree,form</field>
     </record>
diff --git a/yuthon_maintain/models/property_report_repair.py b/yuthon_maintain/models/property_report_repair.py
index e911080e5..3667b8ef5 100644
--- a/yuthon_maintain/models/property_report_repair.py
+++ b/yuthon_maintain/models/property_report_repair.py
@@ -7,7 +7,6 @@ class PropertyRentRelief(models.Model):
     _name = 'property.report.repair'
     _description = '报事报修审批'
     _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
-    _rec_name = 'name'
 
     name = fields.Char(string='标题')
     code = fields.Char(string="报修编号",
diff --git a/yuthon_maintain/views/property_report_repair.xml b/yuthon_maintain/views/property_report_repair.xml
index 4a93d10d8..07346d782 100644
--- a/yuthon_maintain/views/property_report_repair.xml
+++ b/yuthon_maintain/views/property_report_repair.xml
@@ -24,7 +24,7 @@
                             invisible="urgency_level != 'emergency'"/>
                     <group col="3">
                         <group>
-                            <field name="name" string="保修编号" readonly="1"/>
+                            <field name="code" string="保修编号" readonly="1"/>
                         </group>
                         <group>
                             <field name="urgency_level" readonly="1"/>
diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml
index 1e16c5e10..7f5087ab9 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -359,6 +359,7 @@
                 <field name="last_year_safety" decoration-danger="1" optional="show"/>
                 <field name="last_year_performance_evaluation" decoration-danger="1" optional="show"/>
                 <field name="salary_state" optional="show"/>
+                <field name="company_id" optional="hide"/>
                 <field name="is_salary_release" column_invisible="1"/>
                 <field name="is_salary_push" column_invisible="1"/>
                 <field name="is_push" column_invisible="1"/>
diff --git a/yuthon_will_task/views/yuthon_will_task_views.xml b/yuthon_will_task/views/yuthon_will_task_views.xml
index 98f726081..c80bc6c58 100644
--- a/yuthon_will_task/views/yuthon_will_task_views.xml
+++ b/yuthon_will_task/views/yuthon_will_task_views.xml
@@ -16,7 +16,6 @@
                 <field name='employee_ids' widget="many2many_tags" required="1" options="{'no_create': True}"/>
                 <field name="address"/>
                 <field name='priority'/>
-                <field name='end_time' optional="hide" />
                 <field name='creation_time' optional="hide"/>
                 <field name='task_time_ids' widget="many2many_tags" required="1" class="button_width"/>
                 <field name='remarks'/>
@@ -110,7 +109,6 @@
                 <field name='employee_ids' widget="many2many_tags" required="1"/>
                  <field name="address"/>
                 <field name='priority'/>
-                <field name='end_time' optional="hide" />
                 <field name='creation_time' optional="hide"/>
                 <field name='task_time_ids' widget="many2many_tags" required="1"/>
                 <field name='remarks'/>