From 458ee4bbe2e911af375a10c82c48d435d63c6c55 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 3 Jan 2025 20:18:49 +0800
Subject: [PATCH 1/5] =?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/yuthon_fixes_approval_views.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/yuthon_holiday/views/yuthon_fixes_approval_views.xml b/yuthon_holiday/views/yuthon_fixes_approval_views.xml
index fad0f1794..359cff74b 100644
--- a/yuthon_holiday/views/yuthon_fixes_approval_views.xml
+++ b/yuthon_holiday/views/yuthon_fixes_approval_views.xml
@@ -26,8 +26,10 @@
                             <field name="related_issues_id" invisible="not is_issues"/>
                         </group>
                         <group>
-                            <field name="original_days"/>
-                            <field name="now_days"/>
+                            <field name="original_days" invisible="now_type != 'days'"/>
+                            <field name="now_days" invisible="now_type != 'days'"/>
+                            <field name="original_hours" invisible="now_type != 'hours'"/>
+                            <field name="now_hours" invisible="now_type != 'hours'"/>
                             <field name="remarks" invisible="1"/>
                             <field name="yuthon_company" invisible="1"/>
                             <field name="department_id" invisible="1"/>

From dec87ffa9c8e05d99322af293df473a71839cf9c Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 3 Jan 2025 20:34:15 +0800
Subject: [PATCH 2/5] =?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/inherit_hr_leave_allocation_views.xml | 2 +-
 yuthon_performance/__manifest__.py                         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/yuthon_holiday/views/inherit_hr_leave_allocation_views.xml b/yuthon_holiday/views/inherit_hr_leave_allocation_views.xml
index 933c2f0ce..8dac334be 100644
--- a/yuthon_holiday/views/inherit_hr_leave_allocation_views.xml
+++ b/yuthon_holiday/views/inherit_hr_leave_allocation_views.xml
@@ -38,7 +38,7 @@
         <field name="model">hr.leave.allocation</field>
         <field name="inherit_id" ref="hr_holidays.hr_leave_allocation_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[@name='duration_display']" position="after">
+            <xpath expr="//group[@name='alloc_right_col']" position="after">
                 <group>
                     <field name="remarks" invisible="1"/>
                 </group>
diff --git a/yuthon_performance/__manifest__.py b/yuthon_performance/__manifest__.py
index 7d9f3a606..9a887e932 100644
--- a/yuthon_performance/__manifest__.py
+++ b/yuthon_performance/__manifest__.py
@@ -14,6 +14,7 @@
     'data': [
         'security/ir.model.access.csv',
         'data/library_changes_data.xml',
+        'views/performacne_menu.xml',
         'views/yuthon_Index_management.xml',
         'views/yuthon_duty_management.xml',
         'views/yuthon_performance_menus.xml',

From 85d25411a5165b9eec32d00e455f0d4a26be3657 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 3 Jan 2025 20:46:40 +0800
Subject: [PATCH 3/5] =?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_performance/views/performacne_menu.xml | 220 ++----------------
 .../views/yuthon_Index_approval.xml           |  13 --
 .../views/yuthon_Index_management.xml         |  15 --
 .../views/yuthon_assessment_tasks.xml         |  12 -
 .../views/yuthon_duty_management.xml          |  12 -
 .../views/yuthon_employee_appraisal.xml       |  12 -
 .../views/yuthon_employee_approval.xml        |  12 -
 .../views/yuthon_employee_performance.xml     |  12 -
 .../views/yuthon_grading_tasks.xml            |  12 -
 .../views/yuthon_index_employee.xml           |  12 -
 yuthon_performance/views/yuthon_kpi_tasks.xml |  12 -
 .../views/yuthon_plan_management.xml          |  12 -
 .../views/yuthon_tissue_duty_approval.xml     |  13 --
 13 files changed, 17 insertions(+), 352 deletions(-)

diff --git a/yuthon_performance/views/performacne_menu.xml b/yuthon_performance/views/performacne_menu.xml
index beabbfa34..d2eedf652 100644
--- a/yuthon_performance/views/performacne_menu.xml
+++ b/yuthon_performance/views/performacne_menu.xml
@@ -5,75 +5,71 @@
               name="绩效考核"
                web_icon="yuthon_performance,static/description/icon.png"
               sequence="13"/>
-    <menuitem id="yuthon_performance_menu_tt_root"
-              name="天河投资绩效"
+     <menuitem id="yuthon_index_management_menu"
               parent="yuthon_performance_menu_config_root"
-              sequence="1"/>
-     <menuitem id="yuthon_index_management_menu_tt"
-              parent="yuthon_performance_menu_tt_root"
               name="指标库"
               sequence="1"/>
     <menuitem id="yuthon_organization_performance_library"
-              parent="yuthon_index_management_menu_tt"
+              parent="yuthon_index_management_menu"
               name="组织绩效指标库"
               sequence="1"
               action="yuthon_index_management_action1"/>
     <menuitem id="yuthon_employee_performance_library"
-              parent="yuthon_index_management_menu_tt"
+              parent="yuthon_index_management_menu"
               name="员工绩效指标库"
               sequence="3"
               action="yuthon_index_employee_action1"/>
     <menuitem id="yuthon_performance_approval_management_menu"
-              parent="yuthon_index_management_menu_tt"
+              parent="yuthon_index_management_menu"
               name="组织指标变更申请表"
               action="yuthon_index_approval_action1"
               sequence="5"/>
     <menuitem id="yuthon_performance_employee_management_menu"
-              parent="yuthon_index_management_menu_tt"
+              parent="yuthon_index_management_menu"
               name="员工指标变更申请表"
               action="yuthon_employee_approval_action1"
               sequence="7"/>
-    <menuitem id="yuthon_performance_duty_menu_tt"
-              parent="yuthon_performance_menu_tt_root"
+    <menuitem id="yuthon_performance_duty_menu"
+              parent="yuthon_performance_menu_config_root"
               name="考核任务"
               sequence="3"/>
     <menuitem id="yuthon_performance_duty_management_menu"
-              parent="yuthon_performance_duty_menu_tt"
+              parent="yuthon_performance_duty_menu"
               name="考核任务总汇"
               action="yuthon_assessment_tasks_action1"
               sequence="1"/>
     <menuitem id="yuthon_organization_performance_menu"
-              parent="yuthon_performance_duty_menu_tt"
+              parent="yuthon_performance_duty_menu"
               name="组织绩效责任书"
               sequence="3"
               action="yuthon_duty_management_action1"/>
     <menuitem id="yuthon_employee_performance_menu"
-              parent="yuthon_performance_duty_menu_tt"
+              parent="yuthon_performance_duty_menu"
               name="员工绩效"
               sequence="5"
               action="yuthon_employee_performance_action1"/>
     <menuitem id="yuthon_tissue_duty_approval_menu"
               name="组织绩效变更申请"
-              parent="yuthon_performance_duty_menu_tt"
+              parent="yuthon_performance_duty_menu"
               sequence="7"
               action="yuthon_tissue_duty_approval_action1"/>
     <menuitem id="yuthon_plan_management"
-              parent="yuthon_performance_menu_tt_root"
+              parent="yuthon_performance_menu_config_root"
               name="个人工作任务"
               sequence="5"
               action="yuthon_plan_management_action1"/>
-    <menuitem id="action_yuthon_personal_logs"
-              parent="yuthon_performance_menu_tt_root"
+    <menuitem id="action_yuthon_personal_logs_menu"
+              parent="yuthon_performance_menu_config_root"
               name="个人日志表"
               sequence="6"
               action="action_yuthon_personal_logs"/>
     <menuitem id="yuthon_departmental_responsible"
-              parent="yuthon_performance_menu_tt_root"
-              name="本部门绩效责任书"
+              parent="yuthon_performance_menu_config_root"
+              name="绩效责任书"
               sequence="9"
               action="action_yuthon_departmental_responsible"/>
     <menuitem id="yuthon_score_root"
-              parent="yuthon_performance_menu_tt_root"
+              parent="yuthon_performance_menu_config_root"
               name="评分"
               sequence="15"/>
     <menuitem id="yuthon_score_form_menu"
@@ -95,186 +91,4 @@
               name="员工绩效考核表"
               sequence="5"
               action="yuthon_employee_appraisal_action1"/>
-
-    <!--天河粮储-->
-    <menuitem id="yuthon_performance_menu_lc_config"
-              name="天河粮储绩效"
-              parent="yuthon_performance_menu_config_root"
-              sequence="3"/>
-     <menuitem id="yuthon_index_management_menu_lc"
-              parent="yuthon_performance_menu_lc_config"
-              name="指标库"
-              sequence="1"/>
-    <menuitem id="yuthon_organization_performance_library"
-              parent="yuthon_index_management_menu_lc"
-              name="组织绩效指标库"
-              sequence="1"
-              action="yuthon_index_management_action2"/>
-    <menuitem id="yuthon_employee_performance_library"
-              parent="yuthon_index_management_menu_lc"
-              name="员工绩效指标库"
-              sequence="3"
-              action="yuthon_index_employee_action2"/>
-    <menuitem id="yuthon_performance_approval_management_menu"
-              parent="yuthon_index_management_menu_lc"
-              name="组织指标变更申请表"
-              action="yuthon_index_approval_action2"
-              sequence="5"/>
-    <menuitem id="yuthon_performance_employee_management_menu"
-              parent="yuthon_index_management_menu_lc"
-              name="员工指标变更申请表"
-              action="yuthon_employee_approval_action2"
-              sequence="7"/>
-    <menuitem id="yuthon_performance_duty_menu_lc"
-              parent="yuthon_performance_menu_lc_config"
-              name="考核任务"
-              sequence="3"/>
-    <menuitem id="yuthon_performance_duty_management_menu"
-              parent="yuthon_performance_duty_menu_lc"
-              name="考核任务总汇"
-              action="yuthon_assessment_tasks_action2"
-              sequence="1"/>
-    <menuitem id="yuthon_organization_performance_menu"
-              parent="yuthon_performance_duty_menu_lc"
-              name="组织绩效责任书"
-              sequence="3"
-              action="yuthon_duty_management_action2"/>
-    <menuitem id="yuthon_employee_performance_menu"
-              parent="yuthon_performance_duty_menu_lc"
-              name="员工绩效"
-              sequence="5"
-              action="yuthon_employee_performance_action2"/>
-    <menuitem id="yuthon_tissue_duty_approval_menu"
-              name="组织绩效变更申请"
-              parent="yuthon_performance_duty_menu_lc"
-              sequence="7"
-              action="yuthon_tissue_duty_approval_action2"/>
-    <menuitem id="yuthon_plan_management"
-              parent="yuthon_performance_menu_lc_config"
-              name="个人工作任务"
-              sequence="5"
-              action="yuthon_plan_management_action2"/>
-    <menuitem id="action_yuthon_personal_logs"
-              parent="yuthon_performance_menu_lc_config"
-              name="个人日志表"
-              sequence="6"
-              action="action_yuthon_personal_logs"/>
-    <menuitem id="yuthon_departmental_responsible"
-              parent="yuthon_performance_menu_lc_config"
-              name="本部门绩效责任书"
-              sequence="9"
-              action="action_yuthon_departmental_responsible"/>
-    <menuitem id="yuthon_score_root"
-              parent="yuthon_performance_menu_lc_config"
-              name="评分"
-              sequence="15"/>
-    <menuitem id="yuthon_score_form_menu"
-              parent="yuthon_score_root"
-              name="组织绩效评分表"
-              sequence="2"/>
-    <menuitem id="yuthon_gs_tasks_menu"
-              parent="yuthon_score_form_menu"
-              name="GS评分表"
-              sequence="1"
-              action="yuthon_grading_tasks_action2"/>
-    <menuitem id="yuthon_kpi_tasks_menu"
-              parent="yuthon_score_form_menu"
-              name="KPI评分表"
-              sequence="3"
-              action="yuthon_kpi_tasks_action2"/>
-    <menuitem id="yuthon_employee_appraisal_root"
-              parent="yuthon_score_root"
-              name="员工绩效考核表"
-              sequence="5"
-              action="yuthon_employee_appraisal_action2"/>
-    <menuitem id="yuthon_performance_menu_wg_config"
-              name="天河物管绩效"
-              parent="yuthon_performance_menu_config_root"
-              sequence="5"/>
-    <menuitem id="yuthon_index_management_menu_wg"
-              parent="yuthon_performance_menu_wg_config"
-              name="指标库"
-              sequence="1"/>
-    <menuitem id="yuthon_organization_performance_library_board3"
-              parent="yuthon_index_management_menu_wg"
-              name="组织绩效指标库"
-              sequence="1"
-              action="yuthon_index_management_action3"/>
-    <menuitem id="yuthon_employee_performance_library_board3"
-              parent="yuthon_index_management_menu_wg"
-              name="员工绩效指标库"
-              sequence="3"
-              action="yuthon_index_employee_action3"/>
-    <menuitem id="yuthon_performance_approval_management_menu_board3"
-              parent="yuthon_index_management_menu_wg"
-              name="组织指标变更申请表"
-              action="yuthon_index_approval_action3"
-              sequence="5"/>
-    <menuitem id="yuthon_performance_employee_management_menu_board3"
-              parent="yuthon_index_management_menu_wg"
-              name="员工指标变更申请表"
-              action="yuthon_employee_approval_action3"
-              sequence="7"/>
-    <menuitem id="yuthon_performance_duty_menu_wg"
-              parent="yuthon_performance_menu_wg_config"
-              name="考核任务"
-              sequence="3"/>
-    <menuitem id="yuthon_performance_duty_management_menu_board3"
-              parent="yuthon_performance_duty_menu_wg"
-              name="考核任务总汇"
-              action="yuthon_assessment_tasks_action3"
-              sequence="1"/>
-    <menuitem id="yuthon_organization_performance_menu_board3"
-              parent="yuthon_performance_duty_menu_wg"
-              name="组织绩效责任书"
-              sequence="3"
-              action="yuthon_duty_management_action3"/>
-    <menuitem id="yuthon_employee_performance_menu_board3"
-              parent="yuthon_performance_duty_menu_wg"
-              name="员工绩效"
-              sequence="5"
-              action="yuthon_employee_performance_action3"/>
-    <menuitem id="yuthon_tissue_duty_approval_menu_board3"
-              name="组织绩效变更申请"
-              parent="yuthon_performance_duty_menu_wg"
-              sequence="7"
-              action="yuthon_tissue_duty_approval_action3"/>
-    <menuitem id="yuthon_plan_management_board3"
-              parent="yuthon_performance_menu_wg_config"
-              name="个人工作任务"
-              sequence="5"
-              action="yuthon_plan_management_action3"/>
-    <menuitem id="action_yuthon_personal_logs_board3"
-              parent="yuthon_performance_menu_wg_config"
-              name="个人日志表"
-              sequence="6"
-              action="action_yuthon_personal_logs"/>
-    <menuitem id="yuthon_departmental_responsible_board3"
-              parent="yuthon_performance_menu_wg_config"
-              name="本部门绩效责任书"
-              sequence="9"
-              action="action_yuthon_departmental_responsible"/>
-    <menuitem id="yuthon_score_root_board3"
-              parent="yuthon_performance_menu_wg_config"
-              name="评分"
-              sequence="15"/>
-    <menuitem id="yuthon_score_form_menu_board3"
-              parent="yuthon_score_root_board3"
-              name="组织绩效评分表"
-              sequence="2"/>
-    <menuitem id="yuthon_gs_tasks_menu_board3"
-              parent="yuthon_score_form_menu_board3"
-              name="GS评分表"
-              sequence="1"
-              action="yuthon_grading_tasks_action3"/>
-    <menuitem id="yuthon_kpi_tasks_menu_board3"
-              parent="yuthon_score_form_menu_board3"
-              name="KPI评分表"
-              sequence="3"
-              action="yuthon_kpi_tasks_action3"/>
-    <menuitem id="yuthon_employee_appraisal_root_board3"
-              parent="yuthon_score_root_board3"
-              name="员工绩效考核表"
-              sequence="5"
-              action="yuthon_employee_appraisal_action2"/>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_Index_approval.xml b/yuthon_performance/views/yuthon_Index_approval.xml
index e71ddb7cc..43871d914 100644
--- a/yuthon_performance/views/yuthon_Index_approval.xml
+++ b/yuthon_performance/views/yuthon_Index_approval.xml
@@ -100,17 +100,4 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
-    <record id="yuthon_index_approval_action2" model="ir.actions.act_window">
-        <field name="name">组织指标库变更</field>
-        <field name="res_model">yuthon.index.approval</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-    </record>
-    <record id="yuthon_index_approval_action3" model="ir.actions.act_window">
-        <field name="name">组织指标库变更</field>
-        <field name="res_model">yuthon.index.approval</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thwg')]</field>
-    </record>
-
 </odoo>
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_Index_management.xml b/yuthon_performance/views/yuthon_Index_management.xml
index 7669e8cb6..20b981212 100644
--- a/yuthon_performance/views/yuthon_Index_management.xml
+++ b/yuthon_performance/views/yuthon_Index_management.xml
@@ -76,20 +76,5 @@
         <field name="res_model">yuthon.index.management</field>
         <field name="view_mode">tree,form</field>
         <field name="context">{'search_default_group_development_goals': 1}</field>
-        <field name="domain">[('yuthon_company','=','thtz')]</field>
-    </record>
-    <record id="yuthon_index_management_action2" model="ir.actions.act_window">
-        <field name="name">组织绩效</field>
-        <field name="res_model">yuthon.index.management</field>
-        <field name="view_mode">tree,form</field>
-        <field name="context">{'search_default_group_development_goals': 1}</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-    </record>
-    <record id="yuthon_index_management_action3" model="ir.actions.act_window">
-        <field name="name">组织绩效</field>
-        <field name="res_model">yuthon.index.management</field>
-        <field name="view_mode">tree,form</field>
-        <field name="context">{'search_default_group_development_goals': 1}</field>
-        <field name="domain">[('yuthon_company','=','thwg')]</field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_assessment_tasks.xml b/yuthon_performance/views/yuthon_assessment_tasks.xml
index 1c9500abe..52f2b3058 100644
--- a/yuthon_performance/views/yuthon_assessment_tasks.xml
+++ b/yuthon_performance/views/yuthon_assessment_tasks.xml
@@ -72,16 +72,4 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
-    <record id="yuthon_assessment_tasks_action2" model="ir.actions.act_window">
-        <field name="name">考核任务</field>
-        <field name="res_model">yuthon.assessment.tasks</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-    </record>
-    <record id="yuthon_assessment_tasks_action3" model="ir.actions.act_window">
-        <field name="name">考核任务</field>
-        <field name="res_model">yuthon.assessment.tasks</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thwg')]</field>
-    </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_duty_management.xml b/yuthon_performance/views/yuthon_duty_management.xml
index 20f499a62..4e3aa0091 100644
--- a/yuthon_performance/views/yuthon_duty_management.xml
+++ b/yuthon_performance/views/yuthon_duty_management.xml
@@ -102,16 +102,4 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
-    <record id="yuthon_duty_management_action2" model="ir.actions.act_window">
-        <field name="name">部门责任书</field>
-        <field name="res_model">yuthon.duty.management</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-    </record>
-    <record id="yuthon_duty_management_action3" model="ir.actions.act_window">
-        <field name="name">部门责任书</field>
-        <field name="res_model">yuthon.duty.management</field>
-        <field name="view_mode">tree,form</field>
-         <field name="domain">[('yuthon_company','=','thwg')]</field>
-    </record>
 </odoo>
diff --git a/yuthon_performance/views/yuthon_employee_appraisal.xml b/yuthon_performance/views/yuthon_employee_appraisal.xml
index a03e2b175..fc6f2f257 100644
--- a/yuthon_performance/views/yuthon_employee_appraisal.xml
+++ b/yuthon_performance/views/yuthon_employee_appraisal.xml
@@ -80,17 +80,5 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
-    <record id="yuthon_employee_appraisal_action2" model="ir.actions.act_window">
-        <field name="name">员工绩效考核表</field>
-        <field name="res_model">yuthon.employee.appraisal</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-    </record>
-    <record id="yuthon_employee_appraisal_action3" model="ir.actions.act_window">
-        <field name="name">员工绩效考核表</field>
-        <field name="res_model">yuthon.employee.appraisal</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thwg')]</field>
-    </record>
 </odoo>
 
diff --git a/yuthon_performance/views/yuthon_employee_approval.xml b/yuthon_performance/views/yuthon_employee_approval.xml
index 14bc0a3cc..dd2c41b23 100644
--- a/yuthon_performance/views/yuthon_employee_approval.xml
+++ b/yuthon_performance/views/yuthon_employee_approval.xml
@@ -94,16 +94,4 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
-    <record id="yuthon_employee_approval_action2" model="ir.actions.act_window">
-        <field name="name">员工指标库变更</field>
-        <field name="res_model">yuthon.employee.approval</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-    </record>
-    <record id="yuthon_employee_approval_action3" model="ir.actions.act_window">
-        <field name="name">员工指标库变更</field>
-        <field name="res_model">yuthon.employee.approval</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thwg')]</field>
-    </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_employee_performance.xml b/yuthon_performance/views/yuthon_employee_performance.xml
index d18affd88..09f6e7d04 100644
--- a/yuthon_performance/views/yuthon_employee_performance.xml
+++ b/yuthon_performance/views/yuthon_employee_performance.xml
@@ -73,16 +73,4 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
-    <record id="yuthon_employee_performance_action2" model="ir.actions.act_window">
-        <field name="name">员工绩效</field>
-        <field name="res_model">yuthon.employee.performance</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-    </record>
-    <record id="yuthon_employee_performance_action3" model="ir.actions.act_window">
-        <field name="name">员工绩效</field>
-        <field name="res_model">yuthon.employee.performance</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thwg')]</field>
-    </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_grading_tasks.xml b/yuthon_performance/views/yuthon_grading_tasks.xml
index d61985896..548e9a5d1 100644
--- a/yuthon_performance/views/yuthon_grading_tasks.xml
+++ b/yuthon_performance/views/yuthon_grading_tasks.xml
@@ -62,16 +62,4 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
-    <record id="yuthon_grading_tasks_action2" model="ir.actions.act_window">
-        <field name="name">GS评分表</field>
-        <field name="res_model">yuthon.grading.tasks</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-    </record>
-    <record id="yuthon_grading_tasks_action3" model="ir.actions.act_window">
-        <field name="name">GS评分表</field>
-        <field name="res_model">yuthon.grading.tasks</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thwg')]</field>
-    </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_index_employee.xml b/yuthon_performance/views/yuthon_index_employee.xml
index feab464c0..c954abce3 100644
--- a/yuthon_performance/views/yuthon_index_employee.xml
+++ b/yuthon_performance/views/yuthon_index_employee.xml
@@ -59,16 +59,4 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
-    <record id="yuthon_index_employee_action2" model="ir.actions.act_window">
-        <field name="name">员工绩效</field>
-        <field name="res_model">yuthon.index.employee</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-    </record>
-    <record id="yuthon_index_employee_action3" model="ir.actions.act_window">
-        <field name="name">员工绩效</field>
-        <field name="res_model">yuthon.index.employee</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thwg')]</field>
-    </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_kpi_tasks.xml b/yuthon_performance/views/yuthon_kpi_tasks.xml
index adbbaf8f9..197c1d149 100644
--- a/yuthon_performance/views/yuthon_kpi_tasks.xml
+++ b/yuthon_performance/views/yuthon_kpi_tasks.xml
@@ -64,16 +64,4 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
-    <record id="yuthon_kpi_tasks_action2" model="ir.actions.act_window">
-        <field name="name">KPI评分表</field>
-        <field name="res_model">yuthon.kpi.tasks</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-    </record>
-    <record id="yuthon_kpi_tasks_action3" model="ir.actions.act_window">
-        <field name="name">KPI评分表</field>
-        <field name="res_model">yuthon.kpi.tasks</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thwg')]</field>
-    </record>
 </odoo>
diff --git a/yuthon_performance/views/yuthon_plan_management.xml b/yuthon_performance/views/yuthon_plan_management.xml
index 342c93e53..94f173d79 100644
--- a/yuthon_performance/views/yuthon_plan_management.xml
+++ b/yuthon_performance/views/yuthon_plan_management.xml
@@ -389,16 +389,4 @@
         <field name="view_mode">tree,form</field>
          <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
-    <record id="yuthon_plan_management_action2" model="ir.actions.act_window">
-        <field name="name">个人工作任务</field>
-        <field name="res_model">yuthon.plan.management</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-    </record>
-    <record id="yuthon_plan_management_action3" model="ir.actions.act_window">
-        <field name="name">个人工作任务</field>
-        <field name="res_model">yuthon.plan.management</field>
-        <field name="view_mode">tree,form</field>
-         <field name="domain">[('yuthon_company','=','thwg')]</field>
-    </record>
 </odoo>
diff --git a/yuthon_performance/views/yuthon_tissue_duty_approval.xml b/yuthon_performance/views/yuthon_tissue_duty_approval.xml
index ae387d9be..cd49c2ec8 100644
--- a/yuthon_performance/views/yuthon_tissue_duty_approval.xml
+++ b/yuthon_performance/views/yuthon_tissue_duty_approval.xml
@@ -117,17 +117,4 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
-    <record id="yuthon_tissue_duty_approval_action2" model="ir.actions.act_window">
-        <field name="name">组织绩效变更申请表</field>
-        <field name="res_model">yuthon.tissue.duty.approval</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-    </record>
-    <record id="yuthon_tissue_duty_approval_action3" model="ir.actions.act_window">
-        <field name="name">组织绩效变更申请表</field>
-        <field name="res_model">yuthon.tissue.duty.approval</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thwg')]</field>
-    </record>
-
 </odoo>
\ No newline at end of file

From ad2180b31c091bd5ea7b3352e7ba920ac6080e4b Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 3 Jan 2025 20:49:32 +0800
Subject: [PATCH 4/5] =?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_performance/views/yuthon_Index_approval.xml       | 1 -
 yuthon_performance/views/yuthon_assessment_tasks.xml     | 1 -
 yuthon_performance/views/yuthon_duty_management.xml      | 1 -
 yuthon_performance/views/yuthon_employee_appraisal.xml   | 1 -
 yuthon_performance/views/yuthon_employee_approval.xml    | 1 -
 yuthon_performance/views/yuthon_employee_performance.xml | 1 -
 yuthon_performance/views/yuthon_grading_tasks.xml        | 1 -
 yuthon_performance/views/yuthon_index_employee.xml       | 1 -
 yuthon_performance/views/yuthon_kpi_tasks.xml            | 1 -
 yuthon_performance/views/yuthon_plan_management.xml      | 1 -
 yuthon_performance/views/yuthon_tissue_duty_approval.xml | 1 -
 11 files changed, 11 deletions(-)

diff --git a/yuthon_performance/views/yuthon_Index_approval.xml b/yuthon_performance/views/yuthon_Index_approval.xml
index 43871d914..6dbf89147 100644
--- a/yuthon_performance/views/yuthon_Index_approval.xml
+++ b/yuthon_performance/views/yuthon_Index_approval.xml
@@ -98,6 +98,5 @@
         <field name="name">组织指标库变更</field>
         <field name="res_model">yuthon.index.approval</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_assessment_tasks.xml b/yuthon_performance/views/yuthon_assessment_tasks.xml
index 52f2b3058..b9e2c970d 100644
--- a/yuthon_performance/views/yuthon_assessment_tasks.xml
+++ b/yuthon_performance/views/yuthon_assessment_tasks.xml
@@ -70,6 +70,5 @@
         <field name="name">考核任务</field>
         <field name="res_model">yuthon.assessment.tasks</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_duty_management.xml b/yuthon_performance/views/yuthon_duty_management.xml
index 4e3aa0091..0960a3980 100644
--- a/yuthon_performance/views/yuthon_duty_management.xml
+++ b/yuthon_performance/views/yuthon_duty_management.xml
@@ -100,6 +100,5 @@
         <field name="name">部门责任书</field>
         <field name="res_model">yuthon.duty.management</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
 </odoo>
diff --git a/yuthon_performance/views/yuthon_employee_appraisal.xml b/yuthon_performance/views/yuthon_employee_appraisal.xml
index fc6f2f257..fd01054e8 100644
--- a/yuthon_performance/views/yuthon_employee_appraisal.xml
+++ b/yuthon_performance/views/yuthon_employee_appraisal.xml
@@ -78,7 +78,6 @@
         <field name="name">员工绩效考核表</field>
         <field name="res_model">yuthon.employee.appraisal</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
 </odoo>
 
diff --git a/yuthon_performance/views/yuthon_employee_approval.xml b/yuthon_performance/views/yuthon_employee_approval.xml
index dd2c41b23..d153ca258 100644
--- a/yuthon_performance/views/yuthon_employee_approval.xml
+++ b/yuthon_performance/views/yuthon_employee_approval.xml
@@ -92,6 +92,5 @@
         <field name="name">员工指标库变更</field>
         <field name="res_model">yuthon.employee.approval</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_employee_performance.xml b/yuthon_performance/views/yuthon_employee_performance.xml
index 09f6e7d04..193d7e4f8 100644
--- a/yuthon_performance/views/yuthon_employee_performance.xml
+++ b/yuthon_performance/views/yuthon_employee_performance.xml
@@ -71,6 +71,5 @@
         <field name="name">员工绩效</field>
         <field name="res_model">yuthon.employee.performance</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_grading_tasks.xml b/yuthon_performance/views/yuthon_grading_tasks.xml
index 548e9a5d1..8487e800a 100644
--- a/yuthon_performance/views/yuthon_grading_tasks.xml
+++ b/yuthon_performance/views/yuthon_grading_tasks.xml
@@ -60,6 +60,5 @@
         <field name="name">GS评分表</field>
         <field name="res_model">yuthon.grading.tasks</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_index_employee.xml b/yuthon_performance/views/yuthon_index_employee.xml
index c954abce3..a027cdcd4 100644
--- a/yuthon_performance/views/yuthon_index_employee.xml
+++ b/yuthon_performance/views/yuthon_index_employee.xml
@@ -57,6 +57,5 @@
         <field name="name">员工绩效</field>
         <field name="res_model">yuthon.index.employee</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_kpi_tasks.xml b/yuthon_performance/views/yuthon_kpi_tasks.xml
index 197c1d149..799059ad7 100644
--- a/yuthon_performance/views/yuthon_kpi_tasks.xml
+++ b/yuthon_performance/views/yuthon_kpi_tasks.xml
@@ -62,6 +62,5 @@
         <field name="name">KPI评分表</field>
         <field name="res_model">yuthon.kpi.tasks</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
 </odoo>
diff --git a/yuthon_performance/views/yuthon_plan_management.xml b/yuthon_performance/views/yuthon_plan_management.xml
index 94f173d79..7332b8f01 100644
--- a/yuthon_performance/views/yuthon_plan_management.xml
+++ b/yuthon_performance/views/yuthon_plan_management.xml
@@ -387,6 +387,5 @@
         <field name="name">个人工作任务</field>
         <field name="res_model">yuthon.plan.management</field>
         <field name="view_mode">tree,form</field>
-         <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
 </odoo>
diff --git a/yuthon_performance/views/yuthon_tissue_duty_approval.xml b/yuthon_performance/views/yuthon_tissue_duty_approval.xml
index cd49c2ec8..2a3fe6174 100644
--- a/yuthon_performance/views/yuthon_tissue_duty_approval.xml
+++ b/yuthon_performance/views/yuthon_tissue_duty_approval.xml
@@ -115,6 +115,5 @@
         <field name="name">组织绩效变更申请表</field>
         <field name="res_model">yuthon.tissue.duty.approval</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('yuthon_company','=','thtz')]</field>
     </record>
 </odoo>
\ No newline at end of file

From 891d956160e09c73815efbe032cb3c7d97f37d37 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sat, 4 Jan 2025 10:01:14 +0800
Subject: [PATCH 5/5] =?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_performance/__manifest__.py             |  7 ++++---
 yuthon_performance/models/__init__.py          |  6 +++---
 ...ex_approval.py => yuthon_index_approval.py} |  0
 ...anagement.py => yuthon_index_management.py} |  0
 yuthon_performance/views/performacne_menu.xml  |  6 +++---
 ..._approval.xml => yuthon_index_approval.xml} |  0
 ...agement.xml => yuthon_index_management.xml} |  6 +++---
 .../views/yuthon_performance_menus.xml         |  8 ++++----
 yuthon_property/models/yuthon_property.py      |  2 +-
 .../models/property_lease_contract.py          |  9 +++++----
 .../views/property_lease_contract.xml          | 17 ++++++++++++++++-
 .../views/property_menu_all.xml                | 18 ++++++++++++++++--
 12 files changed, 55 insertions(+), 24 deletions(-)
 rename yuthon_performance/models/{yuthon_Index_approval.py => yuthon_index_approval.py} (100%)
 rename yuthon_performance/models/{yuthon_Index_management.py => yuthon_index_management.py} (100%)
 rename yuthon_performance/views/{yuthon_Index_approval.xml => yuthon_index_approval.xml} (100%)
 rename yuthon_performance/views/{yuthon_Index_management.xml => yuthon_index_management.xml} (95%)

diff --git a/yuthon_performance/__manifest__.py b/yuthon_performance/__manifest__.py
index 9a887e932..22a5ad2d4 100644
--- a/yuthon_performance/__manifest__.py
+++ b/yuthon_performance/__manifest__.py
@@ -14,14 +14,13 @@
     'data': [
         'security/ir.model.access.csv',
         'data/library_changes_data.xml',
-        'views/performacne_menu.xml',
-        'views/yuthon_Index_management.xml',
+        'views/yuthon_index_management.xml',
         'views/yuthon_duty_management.xml',
         'views/yuthon_performance_menus.xml',
         'views/yuthon_plan_management.xml',
         'views/yuthon_departmental_responsible_views.xml',
         'views/yuthon_personal_logs_views.xml',
-        'views/yuthon_Index_approval.xml',
+        'views/yuthon_index_approval.xml',
         'views/yuthon_tissue_duty_approval.xml',
         'views/yuthon_index_employee.xml',
         'views/yuthon_employee_approval.xml',
@@ -31,7 +30,9 @@
         'views/yuthon_grading_tasks.xml',
         'views/yuthon_employee_appraisal.xml',
         'views/yuthon_kpi_tasks.xml',
+        'views/performacne_menu.xml',
         'wizard/yuthon_assessment_tasks_wizard_views.xml',
+
     ],
     'installable': True,
     'application': True,
diff --git a/yuthon_performance/models/__init__.py b/yuthon_performance/models/__init__.py
index 794556b5b..59bda62b1 100644
--- a/yuthon_performance/models/__init__.py
+++ b/yuthon_performance/models/__init__.py
@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 from . import yuthon_employee_approval
-from . import yuthon_Index_management
 from . import yuthon_duty_management
 from . import yuthon_plan_management
-from . import yuthon_Index_approval
 from . import yuthon_tissue_duty_approval
 from . import yuthon_index_employee
 from . import yuthon_plan_approval
@@ -13,4 +11,6 @@ from . import yuthon_grading_tasks
 from . import yuthon_kpi_tasks
 from . import yuthon_employee_appraisal
 from . import yuthon_departmental_responsible
-from . import yuthon_personal_logs
\ No newline at end of file
+from . import yuthon_index_management
+from . import yuthon_personal_logs
+from . import yuthon_index_approval
\ No newline at end of file
diff --git a/yuthon_performance/models/yuthon_Index_approval.py b/yuthon_performance/models/yuthon_index_approval.py
similarity index 100%
rename from yuthon_performance/models/yuthon_Index_approval.py
rename to yuthon_performance/models/yuthon_index_approval.py
diff --git a/yuthon_performance/models/yuthon_Index_management.py b/yuthon_performance/models/yuthon_index_management.py
similarity index 100%
rename from yuthon_performance/models/yuthon_Index_management.py
rename to yuthon_performance/models/yuthon_index_management.py
diff --git a/yuthon_performance/views/performacne_menu.xml b/yuthon_performance/views/performacne_menu.xml
index d2eedf652..d1d503c0b 100644
--- a/yuthon_performance/views/performacne_menu.xml
+++ b/yuthon_performance/views/performacne_menu.xml
@@ -3,9 +3,9 @@
     <!--  绩效考核  -->
     <menuitem id="yuthon_performance_menu_config_root"
               name="绩效考核"
-               web_icon="yuthon_performance,static/description/icon.png"
+              web_icon="yuthon_performance,static/description/icon.png"
               sequence="13"/>
-     <menuitem id="yuthon_index_management_menu"
+    <menuitem id="yuthon_index_management_menu"
               parent="yuthon_performance_menu_config_root"
               name="指标库"
               sequence="1"/>
@@ -13,7 +13,7 @@
               parent="yuthon_index_management_menu"
               name="组织绩效指标库"
               sequence="1"
-              action="yuthon_index_management_action1"/>
+              action="yuthon_index_management_action"/>
     <menuitem id="yuthon_employee_performance_library"
               parent="yuthon_index_management_menu"
               name="员工绩效指标库"
diff --git a/yuthon_performance/views/yuthon_Index_approval.xml b/yuthon_performance/views/yuthon_index_approval.xml
similarity index 100%
rename from yuthon_performance/views/yuthon_Index_approval.xml
rename to yuthon_performance/views/yuthon_index_approval.xml
diff --git a/yuthon_performance/views/yuthon_Index_management.xml b/yuthon_performance/views/yuthon_index_management.xml
similarity index 95%
rename from yuthon_performance/views/yuthon_Index_management.xml
rename to yuthon_performance/views/yuthon_index_management.xml
index 20b981212..1f4dbd343 100644
--- a/yuthon_performance/views/yuthon_Index_management.xml
+++ b/yuthon_performance/views/yuthon_index_management.xml
@@ -40,7 +40,7 @@
                                 <field name="index_name" required="1"/>
                             </h1>
                         </div>
-                        <group col="4">
+                    <group col="4">
                         <group>
                             <field name="sequence"/>
                             <field name="employee_ids" widget="many2many_tags"/>
@@ -60,7 +60,7 @@
                             <field name="end_index_time"/>
                             <field name="development_goals"/>
                         </group>
-                        </group>
+                    </group>
                     <group>
                         <field name="index_compute"/>
                         <field name="check_norm"/>
@@ -71,7 +71,7 @@
         </field>
     </record>
     <!--    Action-->
-    <record id="yuthon_index_management_action1" model="ir.actions.act_window">
+    <record id="yuthon_index_management_action" model="ir.actions.act_window">
         <field name="name">组织绩效</field>
         <field name="res_model">yuthon.index.management</field>
         <field name="view_mode">tree,form</field>
diff --git a/yuthon_performance/views/yuthon_performance_menus.xml b/yuthon_performance/views/yuthon_performance_menus.xml
index de7ceb544..323b16cf9 100644
--- a/yuthon_performance/views/yuthon_performance_menus.xml
+++ b/yuthon_performance/views/yuthon_performance_menus.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <menuitem id="yuthon_performance_menu_config_root"
-              name="绩效考核"
-              web_icon="yuthon_performance,static/description/icon.png"
-              sequence="5"/>
+<!--    <menuitem id="yuthon_performance_menu_config_root"-->
+<!--              name="绩效考核"-->
+<!--              web_icon="yuthon_performance,static/description/icon.png"-->
+<!--              sequence="5"/>-->
 <!--    <menuitem id="yuthon_performance_duty_menu"-->
 <!--              parent="yuthon_performance_menu_config_root"-->
 <!--              name="绩效考核"-->
diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py
index ca62fb8a8..884732f1c 100644
--- a/yuthon_property/models/yuthon_property.py
+++ b/yuthon_property/models/yuthon_property.py
@@ -58,7 +58,7 @@ class YuthonProperty(models.Model):
     start_time = fields.Date(string="生效时间")
     end_date = fields.Date(string="失效日期")
     purpose_id = fields.Many2one('yuthon.resource.purpose', string="管理类型")
-    admin_id = fields.Many2one('res.users', string="管理员")
+    admin_id = fields.Many2one('res.users', string="片区管理员")
     lessee_id = fields.Many2one('property.tenant.information', string='承租方')
     title_address = fields.Many2one('yuthon.property.message', string="产权地址")
     company_id = fields.Many2one('yuthon.property.company', string="所属公司")
diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py
index ac2128ede..d148a35a4 100644
--- a/yuthon_property_approval/models/property_lease_contract.py
+++ b/yuthon_property_approval/models/property_lease_contract.py
@@ -92,6 +92,7 @@ class PropertyLeaseContract(models.Model):
     is_mange = fields.Boolean(string="是否有管理费")
     miscellaneous = fields.Text(string="其他约定")
     total_area = fields.Float(string="总面积", digits=(16, 4))
+    state = fields.Selection([('new', '新建'),('approval','审批'),('cancel','作废')], string="状态", default='new')
     contract_type = fields.Selection([('lease_renewal', '续租'), ('interim', '临租'), ('new', '补充协议'), ('first', '首租')], string="合同类型", default='first')
     lease_ids = fields.One2many('property.lease.contract.line', 'lease_id',string="物业信息明细行")
     breakdown_ids = fields.One2many('property.rent.breakdown.line', 'breakdown_id', string="物业租金明细行")
@@ -432,10 +433,10 @@ class PropertyLeaseContract(models.Model):
                             "period_rent": monthly_amount * increments_month,
                         })
 
-    @api.onchange("first_year_rent")
-    def _onchange_first_year_rent(self):
-        for rec in self:
-            rec.performance_bonds = rec.first_year_rent * 2
+    # @api.onchange("first_year_rent")
+    # def _onchange_first_year_rent(self):
+    #     for rec in self:
+    #         rec.performance_bonds = rec.first_year_rent * 2
 
     # @api.onchange("total_area", "unit_price")
     # def _onchange_deposit(self):
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 464e44195..37c829cc2 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -52,6 +52,7 @@
                         <field name="department_id" invisible="1"/>
                         <field name="name" required="1"/>
                         <field name="use_address"/>
+                        <field name="state"/>
                     </group>
                     <notebook>
                         <page string="物业列表">
@@ -112,6 +113,7 @@
                             <field name="contact" required="1"/>
                             <field name="phone" required="1"/>
                             <field name="email" required="1"/>
+                            <field name="tax_number" required="1"/>
                         </group>
                         <group>
                             <field name="invoicing_type" required="1"/>
@@ -240,10 +242,23 @@
             </search>
         </field>
     </record>
-    <record id="property_lease_contract_action" model="ir.actions.act_window">
+    <record id="property_lease_contract_new_action" model="ir.actions.act_window">
         <field name="name">租赁合同审批</field>
         <field name="res_model">property.lease.contract</field>
         <field name="view_mode">tree,form,search</field>
+        <field name="domain">[('state','=','new')] </field>
+    </record>
+    <record id="property_lease_contract_approval_action" model="ir.actions.act_window">
+        <field name="name">租赁合同审批</field>
+        <field name="res_model">property.lease.contract</field>
+        <field name="view_mode">tree,form,search</field>
+        <field name="domain">[('state','=','approval')]</field>
+    </record>
+    <record id="property_lease_contract_cancel_action" model="ir.actions.act_window">
+        <field name="name">租赁合同审批</field>
+        <field name="res_model">property.lease.contract</field>
+        <field name="view_mode">tree,form,search</field>
+        <field name="domain">[('state','=','cancel')]</field>
     </record>
     <record id="all_data_write_property_contract" model="ir.actions.server">
         <field name="name">批量导入合同</field>
diff --git a/yuthon_property_approval/views/property_menu_all.xml b/yuthon_property_approval/views/property_menu_all.xml
index 3d04b9659..01ce3dcfe 100644
--- a/yuthon_property_approval/views/property_menu_all.xml
+++ b/yuthon_property_approval/views/property_menu_all.xml
@@ -191,11 +191,25 @@
               name="物业交接审批"
               action="view_property_transfer_action"
               sequence="3"/>
-    <menuitem id="property_lease_contract_menu"
+     <menuitem id="property_lease_contract_menu"
               parent="yuthon_property.yuthon_property_estate_menu"
               name="物业合同管理"
-              action="property_lease_contract_action"
               sequence="1"/>
+    <menuitem id="property_lease_contract_new_menu"
+              parent="property_lease_contract_menu"
+              name="新建"
+              action="property_lease_contract_new_action"
+              sequence="1"/>
+    <menuitem id="property_lease_contract_approval_menu"
+              parent="property_lease_contract_menu"
+              name="审批"
+              action="property_lease_contract_approval_action"
+              sequence="3"/>
+    <menuitem id="property_lease_contract_cancel_menu"
+              parent="property_lease_contract_menu"
+              name="作废"
+              action="property_lease_contract_cancel_action"
+              sequence="5"/>
     <!--财务报表 -->
     <menuitem id="yuthon_property_process"
               sequence="99"