From 92b4515607b98d4defa5e794ef1df591fe34b3bb Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 27 Dec 2024 18:59:51 +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

---
 .../models/property_meter_reading.py          |  6 ++--
 .../models/property_tenant_information.py     | 14 +++++++-
 .../views/property_meter_reading_views.xml    | 34 +++++++++++--------
 .../property_tenant_information_views.xml     | 11 ++++++
 4 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/yuthon_property/models/property_meter_reading.py b/yuthon_property/models/property_meter_reading.py
index d71640ae2..e6b4392cb 100644
--- a/yuthon_property/models/property_meter_reading.py
+++ b/yuthon_property/models/property_meter_reading.py
@@ -6,13 +6,14 @@ class PropertyMeterReading(models.Model):
     _description = '抄表'
 
     code = fields.Char(string='仪表编号')
-    position = fields.Char(string='位置')
+    position = fields.Char(string='单元编号')
     property_id = fields.Many2one('yuthon.property', string='物业')
     contract = fields.Char(string='合同')
-    customer = fields.Char(string='客户')
+    customer_id = fields.Many2one('property.tenant.information', string='承租方')
     state = fields.Char(string='状态')
     meter_type = fields.Selection([('electric', '电表'), ('water', '水表')], string='仪表类型')
     payment_account = fields.Selection([('prepaid', '电费'), ('postpaid', '水费')], string='缴费科目')
+    other = fields.Char(string='其他')
     billing_period = fields.Date(string='账期')
     meter_date= fields.Date(string='抄表年月')
     last_meter = fields.Date(string='上次抄表')
@@ -23,3 +24,4 @@ class PropertyMeterReading(models.Model):
     amount_wastage = fields.Float(string='损耗量')
     dosage = fields.Float(string='本次用量')
     generate_charges = fields.Float(string='生成费用')
+    type = fields.Selection([('public', '公共'), ('fees', '收费')], string='类型')
\ No newline at end of file
diff --git a/yuthon_property/models/property_tenant_information.py b/yuthon_property/models/property_tenant_information.py
index 5e9ddc650..67d5442c6 100644
--- a/yuthon_property/models/property_tenant_information.py
+++ b/yuthon_property/models/property_tenant_information.py
@@ -7,13 +7,25 @@ class PropertyTenantInformation(models.Model):
 
     name = fields.Char(string='姓名')
     guarantor = fields.Char(string='担保人')
-    entity_type = fields.Selection([('person', '个人'), ('company', '企业')], string='实体类型')
+    entity_type = fields.Selection([('person', '个人'), ('company', '企业')], string='承租方类型')
     contact = fields.Char(string='联系人')
+    legal = fields.Char(string='法人')
     phone = fields.Char(string='联系电话')
+    home_phone = fields.Char(string='座机')
     email = fields.Char(string='电子邮箱')
     address = fields.Text(string='送达地址')
+    scope_business = fields.Char(string='经营范围')
     invoicing_type = fields.Selection([('spot', '专票'), ('cape', '普票')], string="开票类型")
     rental_purposes = fields.Many2one('yuthon.rental.purpose', string="出租用途")
     invoicing_begins = fields.Char(string="开票抬头")
     tax_number = fields.Char(string="税号")
+    card = fields.Char(string="身份号")
     industry = fields.Char(string="行业")
+    start_date = fields.Date(string="生效日期")
+    end_date = fields.Date(string="失效日期")
+    id_card_id = fields.Many2one('ir.attachment', string='法人身份证')
+    business_license_id = fields.Many2one('ir.attachment', string='营业执照')
+    power_attorney_id = fields.Many2one('ir.attachment', string='委托代理书')
+    attorne_card_id = fields.Many2one('ir.attachment', string='委托代理人身份证')
+
+
diff --git a/yuthon_property/views/property_meter_reading_views.xml b/yuthon_property/views/property_meter_reading_views.xml
index 9624c6fd0..917fdc914 100644
--- a/yuthon_property/views/property_meter_reading_views.xml
+++ b/yuthon_property/views/property_meter_reading_views.xml
@@ -7,22 +7,24 @@
             <tree string="抄表">
                 <field name="code"/>
                 <field name="position"/>
-                <field name="property_id"/>
-                <field name="contract"/>
-                <field name="customer"/>
-                <field name="state"/>
+                <field name="property_id" optional="hide"/>
+                <field name="contract" optional="hide"/>
+                <field name="customer_id"/>
+                <field name="state" optional="hide"/>
                 <field name="meter_type"/>
-                <field name="payment_account"/>
-                <field name="billing_period"/>
-                <field name="meter_date"/>
-                <field name="last_meter"/>
-                <field name="current_meter"/>
-                <field name="apply_standards"/>
-                <field name="price_unit"/>
+                <field name="payment_account" optional="hide"/>
+                <field name="billing_period" optional="hide"/>
+                <field name="meter_date" optional="hide"/>
+                <field name="last_meter" optional="hide"/>
+                <field name="current_meter" optional="hide"/>
+                <field name="apply_standards" optional="hide"/>
+                <field name="price_unit" optional="hide"/>
                 <field name="ratio"/>
-                <field name="amount_wastage"/>
-                <field name="dosage"/>
-                <field name="generate_charges"/>
+                <field name="amount_wastage" optional="hide"/>
+                <field name="dosage" optional="hide"/>
+                <field name="generate_charges" optional="hide"/>
+                <field name="other"/>
+                <field name="type"/>
             </tree>
         </field>
     </record>
@@ -38,8 +40,9 @@
                             <field name="position"/>
                             <field name="property_id"/>
                             <field name="contract"/>
-                            <field name="customer"/>
+                            <field name="customer_id"/>
                             <field name="state"/>
+                            <field name="other"/>
                             <field name="meter_type"/>
                             <field name="payment_account"/>
                             <field name="billing_period"/>
@@ -53,6 +56,7 @@
                             <field name="ratio"/>
                             <field name="amount_wastage"/>
                             <field name="dosage"/>
+                            <field name="type"/>
                             <field name="generate_charges"/>
                         </group>
                     </group>
diff --git a/yuthon_property/views/property_tenant_information_views.xml b/yuthon_property/views/property_tenant_information_views.xml
index c85321d07..d243fa2e2 100644
--- a/yuthon_property/views/property_tenant_information_views.xml
+++ b/yuthon_property/views/property_tenant_information_views.xml
@@ -27,18 +27,29 @@
                     <group col="2">
                         <group>
                            <field name="guarantor"/>
+                            <field name="legal"/>
                             <field name="invoicing_type"/>
                             <field name="contact"/>
                             <field name="phone"/>
                             <field name="email"/>
                             <field name="industry"/>
+                            <field name="home_phone"/>
+                            <field name="id_card_id"/>
+                            <field name="business_license_id"/>
+                            <field name="start_date"/>
                         </group>
                         <group>
                             <field name="address"/>
+                            <field name="entity_type"/>
+                            <field name="scope_business"/>
+                            <field name="card"/>
                             <field name="invoicing_type"/>
                             <field name="rental_purposes"/>
                             <field name="invoicing_begins"/>
                             <field name="tax_number"/>
+                            <field name="power_attorney_id"/>
+                            <field name="attorne_card_id"/>
+                            <field name="end_date"/>
                         </group>
                     </group>
                 </sheet>