From 682c9d91faaffe6d14e42b147a3fbd6c44b10c09 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: Thu, 11 Dec 2025 09:28:28 +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_catering/models/yuthon_catering_setting.py       | 3 +++
 yuthon_catering/views/yuthon_catering_setting_views.xml | 3 +++
 yuthon_property/views/property_meter_archives_views.xml | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/yuthon_catering/models/yuthon_catering_setting.py b/yuthon_catering/models/yuthon_catering_setting.py
index d324b8a43..ba09af4b9 100644
--- a/yuthon_catering/models/yuthon_catering_setting.py
+++ b/yuthon_catering/models/yuthon_catering_setting.py
@@ -33,14 +33,17 @@ class YuthonDishesSetting(models.Model):
     ingredient_id1 = fields.Many2one('yuthon.ingredient.setting', string='食材1')
     ingredient_id2 = fields.Many2one('yuthon.ingredient.setting', string='食材2')
     ingredient_id3 = fields.Many2one('yuthon.ingredient.setting', string='食材3')
+    ingredient_id4 = fields.Many2one('yuthon.ingredient.setting', string='食材4')
 
     single_quantity1 = fields.Float(string='单量1')
     single_quantity2 = fields.Float(string='单量2')
     single_quantity3 = fields.Float(string='单量3')
+    single_quantity4 = fields.Float(string='单量4')
 
     unit1_id = fields.Many2one('yuthon.unit.setting', string='单位1')
     unit2_id = fields.Many2one('yuthon.unit.setting', string='单位2')
     unit3_id = fields.Many2one('yuthon.unit.setting', string='单位3')
+    unit4_id = fields.Many2one('yuthon.unit.setting', string='单位4')
 
 
 class YuthonIngredientSetting(models.Model):
diff --git a/yuthon_catering/views/yuthon_catering_setting_views.xml b/yuthon_catering/views/yuthon_catering_setting_views.xml
index 381e198d5..787422a20 100644
--- a/yuthon_catering/views/yuthon_catering_setting_views.xml
+++ b/yuthon_catering/views/yuthon_catering_setting_views.xml
@@ -34,6 +34,9 @@
                 <field name="ingredient_id3"/>
                 <field name="single_quantity3"/>
                 <field name="unit3_id"/>
+                <field name="ingredient_id4"/>
+                <field name="single_quantity4"/>
+                <field name="unit4_id"/>
             </tree>
         </field>
     </record>
diff --git a/yuthon_property/views/property_meter_archives_views.xml b/yuthon_property/views/property_meter_archives_views.xml
index 65483c3ee..0093e60a4 100644
--- a/yuthon_property/views/property_meter_archives_views.xml
+++ b/yuthon_property/views/property_meter_archives_views.xml
@@ -97,7 +97,7 @@
             <tree string="电表任务" create="1" editable="bottom" limit="15"
                     js_class="custom_meter_button" decoration-success="not is_push" default_order="meter_date_month desc">
                 <header>
-                    <button name="delete_dec_2025_meter_data" type="object" string="删除" class="oe_highlight"/>
+<!--                    <button name="delete_dec_2025_meter_data" type="object" string="删除" class="oe_highlight"/>-->
                     <button name="push_task_push_wizard" type="object" string="推送" class="oe_highlight"/>
                 </header>
                 <field name="is_acc" string="新租" column_invisible="1"/>