From 23573d952dcd8e2940e9bf68b83ee6494dc39567 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 20 Jun 2025 09:59:10 +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_property/views/yuthon_property_views.xml | 16 +++++++++++++++-
 .../views/inherit_yuthon_property_views.xml     | 14 ++++++++++++++
 .../views/property_lease_contract.xml           | 17 +++++++++++++----
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index 6c627a1b1..4c23e44cd 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -348,10 +348,22 @@
             </tree>
         </field>
     </record>
+    <record id="property_management_area_report_search" model="ir.ui.view">
+            <field name="name">property.management.area.report.search</field>
+            <field name="model">yuthon.property</field>
+            <field name="arch" type="xml">
+                <search>
+                    <field name="company_id"/>
+                    <field name="admin_id"/>
+                </search>
+            </field>
+    </record>
     <record id="management_area_report_action" model="ir.actions.act_window">
         <field name="name">管理面积报表</field>
         <field name="res_model">yuthon.property</field>
-        <field name="view_mode">tree</field>
+        <field name="view_mode">tree, search</field>
+        <field name="view_id" ref="yuthon_property.yuthon_property_management_area_report"/>
+        <field name="search_view_id" ref="yuthon_property.property_management_area_report_search"/>
     </record>
 
     <!-- 可租面积报表 -->
@@ -373,6 +385,8 @@
             <field name="name">可租面积报表</field>
             <field name="res_model">yuthon.property</field>
             <field name="view_mode">tree</field>
+            <field name="view_id" ref="yuthon_property.yuthon_property_rent_area_report"/>
+            <field name="search_view_id" ref="yuthon_property.property_management_area_report_search"/>
     </record>
     <record id="yuthon_property_action" model="ir.actions.act_window">
         <field name="name">物业</field>
diff --git a/yuthon_property_approval/views/inherit_yuthon_property_views.xml b/yuthon_property_approval/views/inherit_yuthon_property_views.xml
index 1224d7163..d3f9d19c9 100644
--- a/yuthon_property_approval/views/inherit_yuthon_property_views.xml
+++ b/yuthon_property_approval/views/inherit_yuthon_property_views.xml
@@ -407,11 +407,22 @@
             </tree>
         </field>
     </record>
+    <record id="view_property_accounts_receivable_report_search" model="ir.ui.view">
+            <field name="name">property.accounts.receivable.search</field>
+            <field name="model">property.accounts.receivable</field>
+            <field name="arch" type="xml">
+                    <search>
+                        <field name="contract_id"/>
+                        <field name="admin_id"/>
+                    </search>
+            </field>
+    </record>
     <record id="accounts_receivable_tree_action" model="ir.actions.act_window">
         <field name="name">合同应收报表</field>
         <field name="view_mode">tree</field>
         <field name="res_model">property.accounts.receivable</field>
         <field name="view_id" ref="yuthon_property_approval.view_property_accounts_receivable_report_tree"/>
+        <field name="search_view_id" ref="yuthon_property_approval.view_property_accounts_receivable_report_search"/>
     </record>
      <!-- 违约金明细报表 -->
     <record id="view_property_penalty_line_report" model="ir.ui.view">
@@ -441,6 +452,7 @@
         <field name="res_model">property.accounts.receivable</field>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="yuthon_property_approval.view_property_penalty_line_report"/>
+        <field name="search_view_id" ref="yuthon_property_approval.view_property_accounts_receivable_report_search"/>
     </record>
     <!--本月实收报表-->
     <record id="view_property_received_month_report" model="ir.ui.view">
@@ -462,6 +474,7 @@
         <field name="res_model">property.accounts.receivable</field>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="yuthon_property_approval.view_property_received_month_report"/>
+        <field name="search_view_id" ref="yuthon_property_approval.view_property_accounts_receivable_report_search"/>
     </record>
     <!--累计欠收 -->
     <record id="view_property_accumulated_underpayment_report" model="ir.ui.view">
@@ -485,6 +498,7 @@
         <field name="res_model">property.accounts.receivable</field>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="yuthon_property_approval.view_property_accumulated_underpayment_report"/>
+        <field name="search_view_id" ref="yuthon_property_approval.view_property_accounts_receivable_report_search"/>
     </record>
     <record id="all_button_accounts_receivable" model="ir.actions.server">
         <field name="name">批量生成违约金</field>
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 83e920bba..f399a77fc 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -766,18 +766,27 @@
                 <field name="unit_price"/>
                 <field name="rent" string="租金"/>
                 <field name="admin_id"/>
-                <field name="company_id" string="公告"/>
+                <field name="company_id" string="公司"/>
                 <button name="open_record" string="详情" type="object" class="btn-primary"/>
             </tree>
         </field>
     </record>
+    <record id="yuthon_property_rented_area_report_search" model="ir.ui.view">
+            <field name="name">yuthon.property.rented.area.report.search</field>
+            <field name="model">property.lease.contract</field>
+            <field name="arch" type="xml">
+                <search string="已租面积报表">
+                    <field name="admin_id"/>
+                    <field name="company_id"/>
+                </search>
+            </field>
+    </record>
     <record id="rented_area_report_action" model="ir.actions.act_window">
         <field name="name">已租面积报表</field>
         <field name="res_model">property.lease.contract</field>
         <field name="view_mode">tree</field>
-         <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_property_approval.yuthon_property_rented_area_report')}),
-         ]"/>
+        <field name="view_id" ref="yuthon_property_approval.yuthon_property_rented_area_report"/>
+        <field name="search_view_id" ref="yuthon_property_approval.yuthon_property_rented_area_report_search"/>
     </record>
     <record id="property_lease_contract_message_action" model="ir.actions.act_window">
         <field name="name">合同管理</field>