From 17c65db02c8e6d5ede4e9e9a14e6ed42cd1c68fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Fri, 12 Dec 2025 15:31:57 +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/models/property_meter_archives.py       | 2 +-
 yuthon_property/models/property_meter_water.py          | 2 +-
 yuthon_property/views/property_meter_archives_views.xml | 2 +-
 yuthon_property/views/property_meter_water_views.xml    | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/yuthon_property/models/property_meter_archives.py b/yuthon_property/models/property_meter_archives.py
index 2122cee0d..6308237ee 100644
--- a/yuthon_property/models/property_meter_archives.py
+++ b/yuthon_property/models/property_meter_archives.py
@@ -428,7 +428,7 @@ class MeterArchivesLine(models.Model):
         )
         for meter_id in meter_ids:
             if meter_id.is_push == True:
-                raise ValidationError(f"电表名为{meter_id.archives_id}任务已推送，请勿重复推送")
+                raise UserError(f"电表名为{meter_id.archives_id}任务已推送，请勿重复推送")
         return {
             "name": "电水表任务",
             "type": "ir.actions.act_window",
diff --git a/yuthon_property/models/property_meter_water.py b/yuthon_property/models/property_meter_water.py
index 5bfdba490..58c04165c 100644
--- a/yuthon_property/models/property_meter_water.py
+++ b/yuthon_property/models/property_meter_water.py
@@ -356,7 +356,7 @@ class MeterWaterLine(models.Model):
         )
         for water_id in water_ids:
             if water_id.is_push == True:
-                raise ValidationError(f"水表名为{water_id.archives_id}任务已推送，请勿重复推送")
+                raise UserError(f"水表名为{water_id.archives_id}任务已推送，请勿重复推送")
         return {
             "name": "电水表任务",
             "type": "ir.actions.act_window",
diff --git a/yuthon_property/views/property_meter_archives_views.xml b/yuthon_property/views/property_meter_archives_views.xml
index 0093e60a4..8b1daf8f7 100644
--- a/yuthon_property/views/property_meter_archives_views.xml
+++ b/yuthon_property/views/property_meter_archives_views.xml
@@ -117,6 +117,7 @@
                 <field name="epitope_values_id" string="表位置"/>
                 <field name="last_meter" string="上次抄表日期"/>
                 <field name="last_dosage" string="上次用量"/>
+                <field name="is_push"/>
                 <field name="number" column_invisible="1"/>
                 <field name="sequence" column_invisible="1"/>
                 <field name="meter_date_month" column_invisible="1"/>
@@ -128,7 +129,6 @@
                 <field name="archives_state" column_invisible="1"/>
                 <field name="state" column_invisible="1"/>
                 <field name="maximum_count" column_invisible="1"/>
-                <field name="is_push" column_invisible="1"/>
             </tree>
         </field>
     </record>
diff --git a/yuthon_property/views/property_meter_water_views.xml b/yuthon_property/views/property_meter_water_views.xml
index 3e33a8a45..7afc79535 100644
--- a/yuthon_property/views/property_meter_water_views.xml
+++ b/yuthon_property/views/property_meter_water_views.xml
@@ -98,7 +98,7 @@
         <field name="name">meter.water.line.tree</field>
         <field name="model">meter.water.line</field>
         <field name="arch" type="xml">
-            <tree string="水表任务" create="0" editable="bottom" js_class="custom_water_button" decoration-success="not current_read"
+            <tree string="水表任务" create="0" editable="bottom" js_class="custom_water_button" decoration-success="not is_push"
                 default_order="meter_date_month desc" limit="15">
              <header>
                 <button name="push_task_push_wizard" type="object" string="推送" class="oe_highlight"/>
@@ -119,6 +119,7 @@
                 <field name="epitope_values_id" string="表位置"/>
                 <field name="last_meter" string="上次抄表日期"/>
                 <field name="last_dosage" string="上次用量"/>
+                <field name="is_push"/>
                 <field name="number" column_invisible="1"/>
                 <field name="sequence" column_invisible="1"/>
                 <field name="initial_value" column_invisible="1"/>