From 40ace09ea7d0f8cd5ad3ce9fca39c2196d4cf3da 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: Sat, 8 Nov 2025 16:30:36 +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/yuthon_property.py     |  2 +-
 .../views/yuthon_property_views.xml           |  2 +-
 .../views/property_lease_contract.xml         | 40 +++++++++++++++++++
 .../views/inherit_hr_payslip_views.xml        | 15 ++++---
 4 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py
index 7745d597f..b22c0fe01 100644
--- a/yuthon_property/models/yuthon_property.py
+++ b/yuthon_property/models/yuthon_property.py
@@ -611,7 +611,7 @@ class YuthonPropertyEnergy(models.Model):
     _description = '电表'
 
     property_meter_archives_id = fields.Many2one('property.meter.archives', string="电表编号")
-    rate = fields.Integer(related='property_meter_archives_id.gauge_magnification', string="倍率", store=True)
+    unit_number = fields.Char(related='property_meter_archives_id.unit_number', string="单元编号/用途", store=True)
     standard_id = fields.Many2one(related='property_meter_archives_id.standards_id', string="标准", store=True)
     installation_date = fields.Date(related='property_meter_archives_id.start_time', string="安装日期")
     demolition_date = fields.Date(related='property_meter_archives_id.end_time', string="拆除日期")
diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index e80a7855e..004a0602c 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -247,7 +247,7 @@
                                 <tree editable="bottom">
                                     <field name="yuthon_property_id" column_invisible="1"/>
                                     <field name="property_meter_archives_id" options="{'no_open': True}"/>
-                                    <field name="rate"/>
+                                    <field name="unit_number"/>
                                     <field name="standard_id" options="{'no_open': True}"/>
                                     <field name="installation_date"/>
                                     <field name="demolition_date"/>
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 92836b234..cb685092c 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -682,6 +682,46 @@
                                 </tree>
                             </field>
                         </page>
+                        <notebook class="o_collapsible_notebook">
+                        <page string="租金明细" invisible="contract_sort != 'property'">
+                            <field name="breakdown_ids" string=" ">
+                                <tree editable="bottom" delete="false">
+                                    <field name="breakdown_id" column_invisible="1"/>
+                                    <field name="unit_price"/>
+                                    <field name="monthly_amount"/>
+                                    <field name="start_data"/>
+                                    <field name="end_data"/>
+                                    <field name="month_number"/>
+                                    <field name="period_rent"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="广告位租金明细" invisible="contract_sort != 'guanggao'">
+                            <field name="breakdown_ids" string=" ">
+                                <tree editable="bottom" delete="false">
+                                    <field name="breakdown_id" column_invisible="1"/>
+                                    <field name="unit_price"/>
+                                    <field name="monthly_amount"/>
+                                    <field name="start_data"/>
+                                    <field name="end_data"/>
+                                    <field name="month_number"/>
+                                    <field name="period_rent"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="管子间租金明细" invisible="contract_sort != 'guanzi'">
+                            <field name="breakdown_ids" string=" ">
+                                <tree editable="bottom" delete="false">
+                                    <field name="breakdown_id" column_invisible="1"/>
+                                    <field name="unit_price"/>
+                                    <field name="monthly_amount"/>
+                                    <field name="start_data"/>
+                                    <field name="end_data"/>
+                                    <field name="month_number"/>
+                                    <field name="period_rent"/>
+                                </tree>
+                            </field>
+                        </page>
                         <page string="管理费明细" invisible="not is_manage">
                             <field name="management_breakdown_ids" string=" ">
                                 <tree editable="bottom">
diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml
index 740961b6d..878747f4c 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -14,7 +14,6 @@
             </xpath>
             <xpath expr="//field[@name='employee_id']" position="attributes">
                 <attribute name="widget">false</attribute>
-                <attribute name="options">"{'no_open': True}"</attribute>
             </xpath>
             <xpath expr="//field[@name='basic_wage']" position="attributes">
                 <attribute name="column_invisible">1</attribute>
@@ -248,7 +247,7 @@
                     <button name="action_refresh_from_work_entries" string="重新计算" type="object" class="oe_highlight"/>
                     <button name="all_put_release" type="object" string="推送" class="oe_highlight"/>
                 </header>
-                <field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}"/>
+                <field name="employee_id" string="姓名" readonly="1" />
                 <field name="date_of_entry"/>
                 <field name="bank_account_id"/>
                 <field name="actual_salary"/>
@@ -318,7 +317,7 @@
                     <button name="action_refresh_from_work_entries" string="重新计算" type="object" class="oe_highlight"/>
                     <button name="all_put_release" type="object" string="推送" class="oe_highlight"/>
                 </header>
-                <field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}"/>
+                <field name="employee_id" string="姓名" readonly="1"/>
                 <field name="date_of_entry"/>
                 <field name="bank_account_id"/>
                 <field name="actual_salary"/>
@@ -375,7 +374,7 @@
                     <button name="action_refresh_from_work_entries" string="重新计算" type="object" class="oe_highlight"/>
                     <button name="all_put_release" type="object" string="推送" class="oe_highlight"/>
                 </header>
-                <field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}"/>
+                <field name="employee_id" string="姓名" readonly="1"/>
                 <field name="date_of_entry"/>
                 <field name="bank_account_id"/>
                 <field name="actual_salary"/>
@@ -430,7 +429,7 @@
                     <button name="action_put_wizard" string="推送" type="object" class="oe_highlight"/>
                     <button name="action_refresh_from_work_entries" string="重新计算" type="object" class="oe_highlight"/>
                 </header>
-                <field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}"/>
+                <field name="employee_id" string="姓名" readonly="1"/>
                 <field name="date_of_entry"/>
                 <field name="total_before_tax"/>
                 <field name="three_one"/>
@@ -503,7 +502,7 @@
                     <button name="action_put_wizard" string="推送" type="object" class="oe_highlight"/>
                     <button name="action_refresh_from_work_entries" string="重新计算" type="object" class="oe_highlight"/>
                 </header>
-                <field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}"/>
+                <field name="employee_id" string="姓名" readonly="1"/>
                 <field name="date_of_entry"/>
                 <field name="total_before_tax"/>
                 <field name="three_one"/>
@@ -558,7 +557,7 @@
                     <button name="action_put_wizard" string="推送" type="object" class="oe_highlight"/>
                     <button name="action_refresh_from_work_entries" string="重新计算" type="object" class="oe_highlight"/>
                 </header>
-                <field name="employee_id" string="姓名" readonly="1" options="{'no_open': True}"/>
+                <field name="employee_id" string="姓名" readonly="1"/>
                 <field name="date_of_entry"/>
                 <field name="total_before_tax"/>
                 <field name="three_one"/>
@@ -613,7 +612,7 @@
                     <button name="action_put_salary_wizard" string="推送" type="object" class="oe_highlight"/>
                     <button name="action_return_wizard" string="退回" type="object" class="oe_highlight"/>
                 </header>
-                <field name="employee_id" string="姓名" options="{'no_open': True}"/>
+                <field name="employee_id" string="姓名"/>
                 <field name="struct_id" string="职级"/>
                 <field name="card_type" optional="show"/>
                 <field name="identification_id" optional="show"/>