From 1122bfa97107ee8a8e6a46bc493aed4de261e856 Mon Sep 17 00:00:00 2001
From: pengyuthon <pengyuthon@163.com>
Date: Thu, 9 Oct 2025 21:49:53 +0800
Subject: [PATCH] 1

---
 yuthon_property/models/property_meter_water.py          | 2 +-
 yuthon_property/views/property_meter_archives_views.xml | 7 ++++++-
 yuthon_property/views/property_meter_water_views.xml    | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/yuthon_property/models/property_meter_water.py b/yuthon_property/models/property_meter_water.py
index b37d6f218..7f4f95485 100644
--- a/yuthon_property/models/property_meter_water.py
+++ b/yuthon_property/models/property_meter_water.py
@@ -199,7 +199,7 @@ class MeterWaterLine(models.Model):
         :return:
         """
         for i in self:
-            last_id = self.env['meter.archives.line'].search(
+            last_id = self.env['meter.water.line'].search(
                 [('meter_date', '<', i.meter_date), ('water_id', '=', i.water_id.id)]).sorted('meter_date')
             if last_id:
                 i.last_dosage = last_id[-1].current_meter
diff --git a/yuthon_property/views/property_meter_archives_views.xml b/yuthon_property/views/property_meter_archives_views.xml
index cc6f331c1..3901324e6 100644
--- a/yuthon_property/views/property_meter_archives_views.xml
+++ b/yuthon_property/views/property_meter_archives_views.xml
@@ -115,6 +115,9 @@
         <field name="model">property.meter.archives</field>
         <field name="arch" type="xml">
             <search string="电表">
+                <field name="name"/>
+                <field name="epitope_values_id"/>
+
                 <field name="yuthon_property_ids"/>
                 <field name="lessee_id"/>
             </search>
@@ -127,6 +130,8 @@
             <search string="电表任务">
                 <field name="yuthon_property_ids"/>
                 <field name="lessee_id"/>
+                <field name="archives_id"/>
+                <field name="epitope_values_id"/>
                 <group expand="0" string="Group By">
                     <filter string="按月" name="group_by_meter_date_month" domain="[]" context="{'group_by': 'meter_date:month'}"/>
                 </group>
@@ -147,7 +152,7 @@
         <field name="view_mode">tree,search</field>
         <field name="context">{'search_default_group_by_meter_date_month': True, 'search_default_group_by_name': True}</field>
         <field name="search_view_id" ref="yuthon_property.meter_archives_line_search"/>
-         <field name="view_ids" eval="[(5, 0, 0),
+        <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_property.view_meter_archives_line_tree')})]"/>
     </record>
     <record id="all_data_meter_property" model="ir.actions.server">
diff --git a/yuthon_property/views/property_meter_water_views.xml b/yuthon_property/views/property_meter_water_views.xml
index a161c8dbb..36a73ff5a 100644
--- a/yuthon_property/views/property_meter_water_views.xml
+++ b/yuthon_property/views/property_meter_water_views.xml
@@ -116,7 +116,8 @@
         <field name="model">property.meter.water</field>
         <field name="arch" type="xml">
             <search string="水表">
-                <field name="name"/>
+                <field name="water_id"/>
+                <field name="epitope_values_id"/>
                 <field name="yuthon_property_ids"/>
                 <field name="lessee_id"/>
             </search>
@@ -127,6 +128,8 @@
         <field name="model">meter.water.line</field>
         <field name="arch" type="xml">
             <search string="水表">
+                <field name="name"/>
+                <field name="epitope_values_id"/>
                 <field name="yuthon_property_ids"/>
                 <field name="lessee_id"/>
                 <group expand="0" string="Group By">