From 91c203d722ddbc9d22cd51b6665dfe343cb5a84b Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 17 Jan 2025 18:19:02 +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_holiday/views/hr_leave_batch.xml       |  4 ++-
 yuthon_hr_attendance/views/card_approval.xml  |  3 ++
 yuthon_hr_attendance/views/duty_approval.xml  | 10 +++---
 yuthon_hr_attendance/views/go_approval.xml    |  4 ++-
 yuthon_hr_attendance/views/leave_approval.xml |  4 ++-
 .../views/overtime_approval.xml               |  4 ++-
 .../views/remove_holiday_approval.xml         |  4 ++-
 .../views/yuthon_abnormal_approval_views.xml  |  4 ++-
 .../yuthon_adjustments_approval_views.xml     |  4 ++-
 .../views/yuthon_customer_approval_views.xml  |  3 ++
 .../views/yuthon_shift_approval_views.xml     |  4 ++-
 .../views/yuthon_special_approval_views.xml   |  4 ++-
 .../yuthon_appointment_approval_views.xml     |  4 ++-
 .../views/yuthon_leaving_approval_views.xml   |  4 ++-
 .../views/yuthon_onboard_approval_views.xml   |  3 ++
 .../views/yuthon_prepare_approval_views.xml   | 21 ++++++------
 .../yuthon_reassignment_approval_views.xml    |  4 ++-
 .../yuthon_regularization_approval_views.xml  |  3 ++
 .../views/yuthon_reward_approval_views.xml    |  4 ++-
 .../views/yuthon_service_approval_views.xml   | 34 ++++++++++---------
 .../views/yuthon_transfer_approval_views.xml  |  4 ++-
 yuthon_issue/views/issue_approval_views.xml   |  3 ++
 .../views/issue_meeting_minutes_views.xml     |  4 ++-
 .../models/property_early_quitting.py         |  2 +-
 .../models/property_lease_extension.py        |  4 +--
 .../views/property_early_quitting.xml         |  5 ++-
 .../views/property_lease_alter.xml            |  4 +--
 .../views/property_lease_extension.xml        | 12 +++----
 .../views/property_menu_all.xml               | 22 ++++--------
 29 files changed, 114 insertions(+), 75 deletions(-)

diff --git a/yuthon_holiday/views/hr_leave_batch.xml b/yuthon_holiday/views/hr_leave_batch.xml
index 0bc11f7ac..73629ee3b 100644
--- a/yuthon_holiday/views/hr_leave_batch.xml
+++ b/yuthon_holiday/views/hr_leave_batch.xml
@@ -19,7 +19,9 @@
             <field name="arch" type="xml">
                 <form>
                     <sheet>
-                        <field name="code" readonly="1"/>
+                        <group>
+                            <field name="code" readonly="1" string="流水号:"/>
+                        </group>
                         <div class="oe_title">
                             <label for="name"/>
                             <h1>
diff --git a/yuthon_hr_attendance/views/card_approval.xml b/yuthon_hr_attendance/views/card_approval.xml
index cc36f4d6d..76a887b5c 100644
--- a/yuthon_hr_attendance/views/card_approval.xml
+++ b/yuthon_hr_attendance/views/card_approval.xml
@@ -18,6 +18,9 @@
         <field name="arch" type="xml">
             <form>
                <sheet>
+                   <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                    <div class="col-12 text-center">
                         <h1>
                             <field name="name" required="1" placeholder="请输入标题"/>
diff --git a/yuthon_hr_attendance/views/duty_approval.xml b/yuthon_hr_attendance/views/duty_approval.xml
index e5a861a69..9c6a381db 100644
--- a/yuthon_hr_attendance/views/duty_approval.xml
+++ b/yuthon_hr_attendance/views/duty_approval.xml
@@ -17,20 +17,20 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <div class="oe_title">
                         <label for="name" placeholder="请输入标题"/>
                         <h1>
                             <field name="name" required="1"/>
                         </h1>
                     </div>
-                    <group>
+                    <group col="2">
                         <group>
                             <field name="users_id"/>
                             <field name="yuthon_company" invisible="1"/>
-                        </group>
-                        <group>
-                            <field name="code"/>
-                            <field name="department_id" invisible="1"/>
+                             <field name="department_id" invisible="1"/>
                         </group>
                         <group>
                             <field name="reason_application" />
diff --git a/yuthon_hr_attendance/views/go_approval.xml b/yuthon_hr_attendance/views/go_approval.xml
index 7fed44dc2..421f65ecf 100644
--- a/yuthon_hr_attendance/views/go_approval.xml
+++ b/yuthon_hr_attendance/views/go_approval.xml
@@ -18,7 +18,9 @@
         <field name="arch" type="xml">
            <form>
                 <sheet>
-                    <field name="code" readonly="1"/>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <div class="oe_title">
                         <label for="name"/>
                         <h1>
diff --git a/yuthon_hr_attendance/views/leave_approval.xml b/yuthon_hr_attendance/views/leave_approval.xml
index b4ef4f64f..92e9a3f5c 100644
--- a/yuthon_hr_attendance/views/leave_approval.xml
+++ b/yuthon_hr_attendance/views/leave_approval.xml
@@ -25,6 +25,9 @@
                     <button name="leave_approval" string="发起申请" type="object" class="oe_highlight"/>
                     <field name="statu" widget="statusbar"/>
                 </header>
+                <group>
+                    <field name="code" readonly="1" string="流水号:"/>
+                </group>
                 <sheet>
                     <div class="oe_title">
                         <label for="name" placeholder="请输入标题"/>
@@ -39,7 +42,6 @@
                         </group>
                         <group>
                             <field name="date"/>
-                            <field name="code"/>
                         </group>
                     </group>
                 </sheet>
diff --git a/yuthon_hr_attendance/views/overtime_approval.xml b/yuthon_hr_attendance/views/overtime_approval.xml
index f431ce9ca..bd73595dd 100644
--- a/yuthon_hr_attendance/views/overtime_approval.xml
+++ b/yuthon_hr_attendance/views/overtime_approval.xml
@@ -21,6 +21,9 @@
                     <button name="put_hr_employee" type="object" string="Approve" class="oe_highlight"/>
                 </header>
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <div class="oe_title">
                         <label for="name"/>
                         <h1>
@@ -30,7 +33,6 @@
                     <group>
                         <group>
                             <field name="users_id"/>
-                            <field name="code"/>
                             <field name="start_time"/>
                             <field name="end_time"/>
                             <field name="duration"/>
diff --git a/yuthon_hr_attendance/views/remove_holiday_approval.xml b/yuthon_hr_attendance/views/remove_holiday_approval.xml
index a794196cf..e3fa2f5c3 100644
--- a/yuthon_hr_attendance/views/remove_holiday_approval.xml
+++ b/yuthon_hr_attendance/views/remove_holiday_approval.xml
@@ -21,6 +21,9 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                      <group string="审批事由">
                         <field name="name" required="1"/>
                         <field name="reason_application"/>
@@ -34,7 +37,6 @@
                         </group>
                         <group>
                             <field name="date"/>
-                            <field name="code"/>
                              <field name="type_remove_holiday"/>
                             <field name="is_issues"/>
                             <field name="related_issues_id" invisible="not is_issues"/>
diff --git a/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml b/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
index 31f8af88c..7667d3ca6 100644
--- a/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
@@ -18,6 +18,9 @@
         <field name="arch" type="xml">
             <form string="值班调休审批">
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <group string="个人信息" col="2">
                         <group>
                             <field name="users_id"/>
@@ -32,7 +35,6 @@
                     <group string="审批事项">
                         <group>
                             <field name="name"/>
-                            <field name="code"/>
                             <field name="reason_application"/>
                             <field name="documents_ids" widget="preview_many2many"/>
                         </group>
diff --git a/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml b/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
index d35fc84e4..380d82a5b 100644
--- a/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
@@ -18,6 +18,9 @@
         <field name="arch" type="xml">
             <form string="值班调休审批">
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <group string="个人信息" col="2">
                         <group>
                             <field name="users_id"/>
@@ -33,7 +36,6 @@
                     <group string="审批事项">
                         <group>
                             <field name="name"/>
-                            <field name="code"/>
                             <field name="reason_application"/>
                             <field name="documents_ids" widget="preview_many2many"/>
                         </group>
diff --git a/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml b/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
index 36c0da8d4..15d5388cc 100644
--- a/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
@@ -16,6 +16,9 @@
         <field name="arch" type="xml">
             <form string="客服值班审批">
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <div class="oe_title">
                         <label for="name"/>
                         <h1>
diff --git a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
index 84d411a77..3d75dcaf7 100644
--- a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
@@ -21,7 +21,9 @@
                     <header>
                         <button name="button_shift_approval" type="object" string="批准" class="oe_highlight"/>
                     </header>
-                    <field name="code" readonly="1"/>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <group string="审批事项">
                         <group>
                             <field name="name" placeholder="请输入标题"/>
diff --git a/yuthon_hr_attendance/views/yuthon_special_approval_views.xml b/yuthon_hr_attendance/views/yuthon_special_approval_views.xml
index b5dba1f4d..03fd7e291 100644
--- a/yuthon_hr_attendance/views/yuthon_special_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_special_approval_views.xml
@@ -21,10 +21,12 @@
                     <header>
                         <button name="button_special_approval" type="object" string="批准" class="oe_highlight"/>
                     </header>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <group string="审批事项">
                         <group>
                             <field name="name" placeholder="请输入标题"/>
-                            <field name="code" invisible="1"/>
                             <field name="reason_application"/>
                             <field name="documents_ids" widget="preview_many2many"/>
                         </group>
diff --git a/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
index f8b33e8f3..07b3ee2b2 100644
--- a/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
@@ -20,9 +20,11 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
+                     <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <group string="基础信息" col="3">
                         <group>
-                            <field name="code"/>
                             <field name="department_id"/>
                         </group>
                         <group>
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 816ec4b41..61c580a1f 100644
--- a/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
@@ -21,6 +21,9 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <group col="4" string="员工信息">
                         <group>
                             <field name="users_id"/>
@@ -30,7 +33,6 @@
                         </group>
                         <group>
                             <field name="department_id"/>
-                            <field name="code"/>
                             <field name="end_of_contract"/>
                             <field name="expected_departure_date"/>
                         </group>
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 5e85374f8..fc869d51c 100644
--- a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
@@ -21,6 +21,9 @@
                     <button name="button_office_supply" type="object" class="oe_highlight" string="办公用品" invisible="not is_office"/>
                 </header>
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <div class="col-12 text-center">
                             <h1>
                                 <field name="name" required="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml
index 834f4f622..87130b4f7 100644
--- a/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml
@@ -17,16 +17,17 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
-                        <group>
-                            <field name="users_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="yuthon_company" invisible="1"/>
-                        </group>
-                        <group>
-                            <field name="code" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="is_issues"/>
-                        </group>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
+                    <group>
+                        <field name="users_id" invisible="1"/>
+                        <field name="department_id" invisible="1"/>
+                        <field name="yuthon_company" invisible="1"/>
+                    </group>
+                    <group>
+                        <field name="department_id" invisible="1"/>
+                    </group>
                     <group string="审批事项">
                         <field name="name" required="1"/>
                         <field name="reason"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml
index 49e47d9d2..c9e5c1b4f 100644
--- a/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml
@@ -22,6 +22,9 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <group string="员工信息" col="4">
                           <group>
                             <field name="users_id"/>
@@ -31,7 +34,6 @@
                         </group>
                         <group>
                             <field name="department_id"/>
-                            <field name="code"/>
                             <field name="business_superior_id"/>
                             <field name="place_of_work"/>
                         </group>
diff --git a/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
index 887bb6577..4f9b67125 100644
--- a/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
@@ -24,6 +24,9 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <group string="员工信息" col="4">
                         <group>
                             <field name="users_id" required="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
index 92f05b1eb..2fa080dba 100644
--- a/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
@@ -20,9 +20,11 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <group string="基础信息" col="3">
                         <group>
-                            <field name="code"/>
                             <field name="yuthon_company" invisible="1"/>
                             <field name="department_id"/>
                         </group>
diff --git a/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
index 0f8e64435..95b956529 100644
--- a/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
@@ -20,23 +20,25 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <group col="3" string="个人信息">
-                            <group>
-                                <field name="code"/>
-                                <field name="service_type"/>
-                                <field name="reason_issuance"/>
-                            </group>
-                            <group>
-                                <field name="users_id"/>
-                                <field name="job_id"/>
-                                <field name="is_issues"/>
-                                <field name="related_issues_id" invisible="not is_issues"/>
-                            </group>
-                            <group>
-                                <field name="department_id"/>
-                                <field name="tenant_user_card"/>
-                                <field name="onboarding_time"/>
-                            </group>
+                        <group>
+                            <field name="service_type"/>
+                            <field name="reason_issuance"/>
+                        </group>
+                        <group>
+                            <field name="users_id"/>
+                            <field name="job_id"/>
+                            <field name="is_issues"/>
+                            <field name="related_issues_id" invisible="not is_issues"/>
+                        </group>
+                        <group>
+                            <field name="department_id"/>
+                            <field name="tenant_user_card"/>
+                            <field name="onboarding_time"/>
+                        </group>
                     </group>
                     <group string="审批事项">
                         <field name="name" required="1"/>
diff --git a/yuthon_hr_employee_approval/views/yuthon_transfer_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_transfer_approval_views.xml
index 50a2e9c2b..8c5b22470 100644
--- a/yuthon_hr_employee_approval/views/yuthon_transfer_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_transfer_approval_views.xml
@@ -21,6 +21,9 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <group col="4" string="员工信息">
                         <group>
                             <field name="users_id"/>
@@ -29,7 +32,6 @@
                         </group>
                         <group>
                             <field name="department_id"/>
-                            <field name="code"/>
                             <field name="end_of_contract"/>
                         </group>
                         <group>
diff --git a/yuthon_issue/views/issue_approval_views.xml b/yuthon_issue/views/issue_approval_views.xml
index 64f06a542..f0b5ca00a 100644
--- a/yuthon_issue/views/issue_approval_views.xml
+++ b/yuthon_issue/views/issue_approval_views.xml
@@ -22,6 +22,9 @@
         <field name="arch" type="xml">
             <form string="议题审批" create="False">
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <group col="4" string="个人信息">
                         <group>
                             <field name="employee_id"/>
diff --git a/yuthon_issue/views/issue_meeting_minutes_views.xml b/yuthon_issue/views/issue_meeting_minutes_views.xml
index ea99a0a49..61e7032c2 100644
--- a/yuthon_issue/views/issue_meeting_minutes_views.xml
+++ b/yuthon_issue/views/issue_meeting_minutes_views.xml
@@ -18,9 +18,11 @@
         <field name="arch" type="xml">
             <form string="会议纪要">
                 <sheet>
+                    <group>
+                        <field name="code" readonly="1" string="流水号:"/>
+                    </group>
                     <group col="2">
                         <group>
-                            <field name="code"/>
                             <field name="name"/>
                             <field name="meeting_id"/>
                             <field name="meeting_date"/>
diff --git a/yuthon_property_approval/models/property_early_quitting.py b/yuthon_property_approval/models/property_early_quitting.py
index f8d23b32f..eaae6aa0c 100644
--- a/yuthon_property_approval/models/property_early_quitting.py
+++ b/yuthon_property_approval/models/property_early_quitting.py
@@ -20,7 +20,7 @@ class PropertyEarlyQuitting(models.Model):
     end_data = fields.Date(string="合同结束日期")
     early_quitting_date = fields.Date(string="提前退租日期")
     original_contract_id = fields.Many2one('ir.attachment', string="合同")
-    contract_id = fields.Many2one('yuthon.property.contract', string="合同")
+    contract_id = fields.Many2one('property.lease.contract', string="合同")
     reason = fields.Char(string="退租原因")
 
     def button_approval(self):
diff --git a/yuthon_property_approval/models/property_lease_extension.py b/yuthon_property_approval/models/property_lease_extension.py
index c4817e4c7..11527cf40 100644
--- a/yuthon_property_approval/models/property_lease_extension.py
+++ b/yuthon_property_approval/models/property_lease_extension.py
@@ -15,9 +15,9 @@ class PropertyLeaseExtension(models.Model):
                        default=lambda self: self.env['ir.sequence'].next_by_code('property_lease_extension_code'))
     property_documents_ids = fields.Many2many('ir.attachment', string="延租文件")
     original_contract_id = fields.Many2one('ir.attachment', string="原合同")
-    lessee_id = fields.Many2one(related='address_id.lessee_id', string="承租方")
+    lessee_id = fields.Many2one(related='contract_id.lessee_id', string="承租方")
     address_id = fields.Many2one('yuthon.property', string="物业地址")
-    contract_id = fields.Many2one('yuthon.property.contract', string="合同")
+    contract_id = fields.Many2one('property.lease.contract', string="合同")
     end_date = fields.Date(string="原到期时间")
     new_end_date = fields.Date(string="延期至")
     reason_extension = fields.Char(string="延期原因")
diff --git a/yuthon_property_approval/views/property_early_quitting.xml b/yuthon_property_approval/views/property_early_quitting.xml
index 0383b475d..157109a00 100644
--- a/yuthon_property_approval/views/property_early_quitting.xml
+++ b/yuthon_property_approval/views/property_early_quitting.xml
@@ -27,18 +27,17 @@
                         <group>
                             <field name="code"/>
                             <field name="start_data"/>
-                            <field name="property_documents_ids" widget="preview_many2many"/>
                             <field name="reason"/>
+                            <field name="property_documents_ids" widget="preview_many2many"/>
                         </group>
                         <group>
                             <field name="lessee_id"/>
                             <field name="end_data"/>
-                            <field name="contract_id"/>
+                            <field name="contract_id" widget="preview_many2one"/>
                         </group>
                         <group>
                             <field name="address_id"/>
                             <field name="early_quitting_date"/>
-                            <field name="contract_id" widget="preview_many2one"/>
                         </group>
                     </group>
                 </sheet>
diff --git a/yuthon_property_approval/views/property_lease_alter.xml b/yuthon_property_approval/views/property_lease_alter.xml
index 373cc3f2c..b8f40bc6f 100644
--- a/yuthon_property_approval/views/property_lease_alter.xml
+++ b/yuthon_property_approval/views/property_lease_alter.xml
@@ -4,7 +4,7 @@
         <field name="name">property.lease.alter.tree</field>
         <field name="model">property.lease.alter</field>
         <field name="arch" type="xml">
-            <tree string="续租审批审批">
+            <tree string="续租审批">
                 <field name="name"/>
                 <field name="code"/>
             </tree>
@@ -15,7 +15,7 @@
         <field name="name">property.lease.alter.form</field>
         <field name="model">property.lease.alter</field>
         <field name="arch" type="xml">
-            <form string="续租审批审批">
+            <form string="续租审批">
                 <sheet>
                     <div class="oe_title">
                         <label for="name"/>
diff --git a/yuthon_property_approval/views/property_lease_extension.xml b/yuthon_property_approval/views/property_lease_extension.xml
index aeccf56db..2d19761fe 100644
--- a/yuthon_property_approval/views/property_lease_extension.xml
+++ b/yuthon_property_approval/views/property_lease_extension.xml
@@ -4,7 +4,7 @@
         <field name="name">property.lease.extension.tree</field>
         <field name="model">property.lease.extension</field>
         <field name="arch" type="xml">
-            <tree string="延租审批">
+            <tree string="续租审批">
                 <field name="name"/>
                 <field name="code"/>
             </tree>
@@ -15,7 +15,7 @@
         <field name="name">property.lease.extension.form</field>
         <field name="model">property.lease.extension</field>
         <field name="arch" type="xml">
-            <form string="延租审批">
+            <form string="续租审批">
                 <sheet>
                     <div class="oe_title">
                         <label for="name"/>
@@ -26,13 +26,13 @@
                     <group col="3">
                         <group>
                             <field name="code"/>
-                            <field name="property_documents_ids"  widget="preview_many2many"/>
                             <field name="new_end_date"/>
+                             <field name="original_contract_id" widget="preview_many2one"/>
                         </group>
                          <group>
-                            <field name="original_contract_id" widget="preview_many2one"/>
                             <field name="lessee_id"/>
-                             <field name="contract_id" invisible="1"/>
+                            <field name="contract_id"/>
+                            <field name="property_documents_ids"  widget="preview_many2many"/>
                         </group>
                          <group>
                             <field name="address_id"/>
@@ -46,7 +46,7 @@
     </record>
 
     <record id="property_lease_extension_action" model="ir.actions.act_window">
-        <field name="name">延租审批</field>
+        <field name="name">续租审批</field>
         <field name="res_model">property.lease.extension</field>
         <field name="view_mode">tree,form</field>
     </record>
diff --git a/yuthon_property_approval/views/property_menu_all.xml b/yuthon_property_approval/views/property_menu_all.xml
index b6839bd9d..8e30eece0 100644
--- a/yuthon_property_approval/views/property_menu_all.xml
+++ b/yuthon_property_approval/views/property_menu_all.xml
@@ -21,13 +21,6 @@
             action="property_business_confirm_action"
             sequence="21"/>
 
-    <menuitem
-            id="property_early_quitting_menu"
-            parent="yuthon_property.property_approval_menu"
-            name="提前退租审批"
-            action="property_early_quitting_action"
-            sequence="24"/>
-
     <menuitem
             id="property_inventory_table_menu"
             parent="yuthon_property.property_approval_menu"
@@ -47,19 +40,18 @@
             parent="yuthon_property.yuthon_property_estate_menu"
             name="流程"
             sequence="10"/>
-    <menuitem
-            id="property_lease_alter_menu"
-            parent="property_contract_process_menu"
-            name="续租审批审批"
-            action="property_lease_alter_action"
-            sequence="1"/>
     <menuitem
             id="property_lease_extension_menu"
             parent="property_contract_process_menu"
-            name="延租审批"
+            name="续租审批"
             action="property_lease_extension_action"
             sequence="3"/>
-
+    <menuitem
+            id="property_early_quitting_menu"
+            parent="property_contract_process_menu"
+            name="提前退租审批"
+            action="property_early_quitting_action"
+            sequence="5"/>
     <menuitem
             id="property_lease_renewal_menu"
             parent="property_contract_process_menu"