From b6c19a38e6ad2931ead6e3dea1fcf80bb68c616b Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Wed, 13 Aug 2025 14:29:26 +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_official/__manifest__.py               |  2 +-
 yuthon_official/views/official_menus.xml      | 30 +++++++++----------
 .../models/property_evaluation_plan.py        |  2 ++
 .../views/property_eligibility.xml            |  9 ++----
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/yuthon_official/__manifest__.py b/yuthon_official/__manifest__.py
index 58f28df2e..ff9081b27 100644
--- a/yuthon_official/__manifest__.py
+++ b/yuthon_official/__manifest__.py
@@ -10,7 +10,7 @@
     'category': 'Human Resources/Attendances',
     'version': '0.1',
     'license': 'LGPL-3',
-    'depends': ['mail', 'hr', 'soong_workflow', 'room', 'yuthon_issue'],
+    'depends': ['mail', 'hr', 'soong_workflow', 'room', 'yuthon_issue', 'yuthon_trade'],
     'data': [
         'data/official_type_data.xml',
         'security/ir.model.access.csv',
diff --git a/yuthon_official/views/official_menus.xml b/yuthon_official/views/official_menus.xml
index 6951518e1..7cbfa5bed 100644
--- a/yuthon_official/views/official_menus.xml
+++ b/yuthon_official/views/official_menus.xml
@@ -85,7 +85,21 @@
               parent="administrative_offices_root_board"
               action="yuthon_trade.view_parking_fee_approval_action"
               sequence="85"/>
-    <menuitem  id="seals_type_setting_board"
+    <menuitem id="yuthon_official_setting"
+              parent="administrative_offices_root_board"
+              name="配置"
+              sequence="99"/>
+   <menuitem  id="official_management_partner_menu"
+              parent="yuthon_official_setting"
+              name="发文单位"
+              action="official_partner_action"
+              sequence="20"/>
+   <menuitem  id="official_management_type_menu"
+              parent="yuthon_official_setting"
+              name="公文类型"
+              action="official_type_action"
+              sequence="30"/>
+    <menuitem id="seals_type_setting_board"
               name="用章类型"
               parent="yuthon_official_setting"
               action="yuthon_trade.view_seals_type_setting_action"
@@ -110,18 +124,4 @@
               parent="yuthon_official_setting"
               action="yuthon_trade.view_project_classify_setting_action"
               sequence="100"/>
-    <menuitem id="yuthon_official_setting"
-              parent="administrative_offices_root_board"
-              name="配置"
-              sequence="99"/>
-   <menuitem  id="official_management_partner_menu"
-              parent="yuthon_official_setting"
-              name="发文单位"
-              action="official_partner_action"
-              sequence="20"/>
-   <menuitem  id="official_management_type_menu"
-              parent="yuthon_official_setting"
-              name="公文类型"
-              action="official_type_action"
-              sequence="30"/>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_property/models/property_evaluation_plan.py b/yuthon_property/models/property_evaluation_plan.py
index e71f65606..fa1218948 100644
--- a/yuthon_property/models/property_evaluation_plan.py
+++ b/yuthon_property/models/property_evaluation_plan.py
@@ -33,6 +33,8 @@ class PropertyEvaluationPlan(models.Model):
                     record.lease_form = 'sublease'
                 else:
                     record.lease_form = 'whole'
+            else:
+                record.lease_form = False
 
 
     def put_assessment_approval(self):
diff --git a/yuthon_property_approval/views/property_eligibility.xml b/yuthon_property_approval/views/property_eligibility.xml
index 69f0b93a7..623fbfb0e 100644
--- a/yuthon_property_approval/views/property_eligibility.xml
+++ b/yuthon_property_approval/views/property_eligibility.xml
@@ -42,17 +42,14 @@
                         </h1>
                     </div>
                     <group string="审批事项">
+                        <field name="users_id"/>
+                        <field name="department_id" invisible="1"/>
+                        <field name="sincerity_gold"/>
                         <field name="work_end" invisible="1"/>
                         <field name="name" required="1"/>
                         <field name="reason"/>
                         <field name="issues_result" invisible="is_issues == False"/>
                         <field name="documents_ids" widget="preview_many2many"/>
-                    </group>
-                    <group string="个人信息">
-                        <field name="users_id"/>
-                        <field name="department_id"/>
-                        <field name="sincerity_gold"/>
-                    </group>
                     <notebook>
                         <page string="承租方列表">
                             <field name="eligibility_ids">