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 @@ + @@ -128,7 +129,6 @@ - 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 @@ meter.water.line.tree meter.water.line -