From 8f9be21adaea8f8ea9fca34fcd70f77c55ce67eb Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 27 Dec 2024 17:51:26 +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     |  8 ++---
 yuthon_property/views/menuitem.xml            | 34 ++++++++++++-------
 .../views/yuthon_property_views.xml           | 23 ++++++++-----
 .../wizard/yuthon_property_wizard.py          |  3 ++
 4 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py
index c264186a0..71b71d2f8 100644
--- a/yuthon_property/models/yuthon_property.py
+++ b/yuthon_property/models/yuthon_property.py
@@ -16,10 +16,8 @@ class YuthonProperty(models.Model):
     house_type_id = fields.Many2one('yuthon.resource.house.type', string="户型")
     district = fields.Char(string="区")
 
-    property_room = fields.Text(string="区")  # 删除要去掉关联
-
     building_area = fields.Float(string="建筑面积")
-    title_deed = fields.Char(string="房产证编号")
+    title_deed = fields.Char(string="产权证编号")
     actual_area = fields.Float(string="实际面积")
     effective_date = fields.Date(string="生效日期")
     property_source = fields.Selection([('cut', '划入'), ('self', '自建'),
@@ -36,9 +34,7 @@ class YuthonProperty(models.Model):
     property_orientation = fields.Selection([('north', '东'), ('south', '南'), ('east', '西'), ('west', '北')],
                                             string="朝向")
     street = fields.Char(string="街道")
-    property_area = fields.Float(string="产权面积")
     pooled_area = fields.Float(string="公摊面积")
-    rentable_area = fields.Float(string="可租面积")
     state = fields.Selection([('to', '待评估'), ('done', '已评估'), ('ing', '评估中'),
                               ('ing_handover', '移交中'), ('done_handover', '已移交'),
                               ('filing', '备案中'), ('net', '挂网'), ('signing', '签约中'),
@@ -65,6 +61,8 @@ class YuthonProperty(models.Model):
     suite_area = fields.Float(string="套内面积")
     start_time = fields.Date(string="生效时间")
     end_date = fields.Date(string="失效日期")
+    purpose_id = fields.Many2one('yuthon.resource.purpose', string="管理类型")
+    admin_id = fields.Many2one('res.users', string="管理员")
     lessee_id = fields.Many2one('yuthon.property.lessee', string='承租方')
     title_address = fields.Many2one('yuthon.property.message', string="产权地址")
     yuthon_company = fields.Selection([('thtz', '天河投资'), ('thwg', '天河物管'), ('thlc', '天河粮储'), ('thtj', '天城投建'), ('housing', '房总')],string="所属公司")
diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml
index afed2b7e4..4fc4f1bc0 100644
--- a/yuthon_property/views/menuitem.xml
+++ b/yuthon_property/views/menuitem.xml
@@ -107,6 +107,20 @@
               name="水表库"
               parent="yuthon_property_meter_archives_menu"
               action="action_property_meter_water"/>
+    <menuitem id="yuthon_property_archives_setting_meu"
+              sequence="5"
+              name="设置"
+              parent="yuthon_property_meter_archives_menu"/>
+    <menuitem id="yuthon_electricity_setting_menu"
+              parent="yuthon_property_archives_setting_meu"
+              name="电费标准配置"
+              action="view_yuthon_electricity_setting_action"
+              sequence="1"/>
+    <menuitem id="yuthon_water_setting_menu"
+              parent="yuthon_property_archives_setting_meu"
+              name="水费标准配置"
+              action="view_yuthon_water_setting_action"
+              sequence="3"/>
 
     <menuitem id="yuthon_property_science_menu"
               sequence="13"
@@ -134,37 +148,37 @@
               parent="yuthon_property_menu_root"/>
     <menuitem id="yuthon_property_fee_management"
               sequence="1"
-              name="费用管理"
+              name="应收"
               parent="yuthon_financial_management_menu"
               action="property_assess_action"/>
     <menuitem id="yuthon_property_rent_list"
               sequence="20"
               name="租金列表"
-              parent="yuthon_financial_management_menu"
+              parent="yuthon_property_fee_management"
               action="view_property_rent_list_action"/>
     <menuitem id="yuthon_property_management_list"
               sequence="23"
               name="管理费列表"
-              parent="yuthon_financial_management_menu"
+              parent="yuthon_property_fee_management"
               action="view_property_management_list_action"/>
     <menuitem id="yuthon_property_penalty_list"
               sequence="25"
               name="违约金列表"
-              parent="yuthon_financial_management_menu"
+              parent="yuthon_property_fee_management"
               action="view_property_penalty_list_action"/>
     <menuitem id="yuthon_property_water_list"
               sequence="28"
               name="水费列表"
-              parent="yuthon_financial_management_menu"
+              parent="yuthon_property_fee_management"
               action="view_property_water_list_action"/>
     <menuitem id="yuthon_property_tariff_list"
               sequence="32"
               name="电费列表"
-              parent="yuthon_financial_management_menu"
+              parent="yuthon_property_fee_management"
               action="view_property_tariff_list_action"/>
     <menuitem id="yuthon_property_other_list"
-              sequence="36"
-              name="其他费用列表"
+              sequence="3"
+              name="应付"
               parent="yuthon_financial_management_menu"
               action="view_property_other_list_action"/>
 
@@ -330,10 +344,6 @@
                   action="yuthon_property_penalty_action" sequence="37"/>
     <menuitem id="yuthon_property_live_room_menu" parent="resource_mgmt_config_menu" name="居住用房配置"
                   action="yuthon_live_room_action" sequence="40"/>
-    <menuitem id="yuthon_electricity_setting_menu" parent="resource_mgmt_config_menu" name="电费标准配置"
-                  action="view_yuthon_electricity_setting_action" sequence="45"/>
-    <menuitem id="yuthon_water_setting_menu" parent="resource_mgmt_config_menu" name="水费标准配置"
-                  action="view_yuthon_water_setting_action" sequence="50"/>
     <menuitem id="yuthon_lot_setting_action_menu" parent="resource_mgmt_config_menu" name="地段配置"
                   action="view_yuthon_lot_setting_action" sequence="55"/>
 
diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index 1d74a0bb7..5a3949cfe 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -12,9 +12,9 @@
                 <field name="name" required="1"/>
                 <field name="state"/>
                 <field name="title_deed"/>
-                <field name="management_area"/>
-                <field name="rent_area"/>
-                <field name="equity_area"/>
+                <field name="management_area" digits="[16, 4]"/>
+                <field name="rent_area" digits="[16, 4]"/>
+                <field name="equity_area" digits="[16, 4]"/>
                 <field name="start_time"/>
                 <field name="end_date"/>
                 <button name="put_offline_approval" type="object" string="提交线下审批" class="btn btn-primary"/>
@@ -67,7 +67,9 @@
                             <field name="rent_area" invisible="1"/>
                             <field name="equity_area" invisible="1"/>
                             <field name="current_rent" invisible="1"/>
-                            <field name="title_deed"/>
+                            <field name="title_deed" invisible="1"/>
+                            <field name="purpose_id" invisible="1"/>
+                            <field name="admin_id" invisible="1"/>
                             <field name="state" readonly="1"/>
                             <field name="is_done_split" invisible="1"/>
                             <field name="is_done_merge" invisible="1"/>
@@ -116,6 +118,7 @@
                                 <tree editable="bottom">
                                     <field name="yuthon_property_id" column_invisible="1"/>
                                     <field name="precinct_id"/>
+                                    <field name="purpose_id"/>
                                     <field name="admin_id"/>
                                     <field name="tenure_type"/>
                                     <field name="yuthon_company"/>
@@ -220,12 +223,14 @@
                 <field name="precinct_id" string="片区"/>
                 <group expand="0">
                     <filter name="group_statu" string="物业状态" context="{'group_by': 'state'}"/>
+                    <filter name="purpose_id" string="管理类型" context="{'group_by': 'purpose_id'}"/>
+                    <filter name="admin_id" string="管理员" context="{'group_by': 'admin_id'}"/>
                 </group>
                 <searchpanel>
                     <field name="yuthon_company" enable_counters="1"/>
                     <field name="tenure_type" enable_counters="1"/>
-                    <field name="referred_id" enable_counters="1"/>
                     <field name="precinct_id" string="所属片区" enable_counters="1"/>
+                    <field name="referred_id" enable_counters="1"/>
                 </searchpanel>
             </search>
         </field>
@@ -252,7 +257,7 @@
                                         </strong>
                                         <!--                                        <div>-->
                                         <!--                                            <span>面积:</span>-->
-                                        <!--                                            <field name="property_area"/>-->
+                                        <!--                                            <field name="equity_area"/>-->
                                         <!--                                        </div>-->
                                         <div>
                                             <span>评估单价:</span>
@@ -289,8 +294,8 @@
                 </header>
                 <field name="name"/>
                 <field name="district"/>
-                <field name="property_area"/>
-                <field name="rentable_area"/>
+                <field name="equity_area"/>
+                <field name="rent_area"/>
                 <field name="unit_price"/>
                 <field name="current_status" optional="hide"/>
                 <field name="registered_use" optional="hide"/>
@@ -310,7 +315,7 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="property_area"/>
+                            <field name="equity_area"/>
                             <field name="district"/>
                             <field name="unit_price"/>
                         </group>
diff --git a/yuthon_property/wizard/yuthon_property_wizard.py b/yuthon_property/wizard/yuthon_property_wizard.py
index be6d82004..a9fcc6768 100644
--- a/yuthon_property/wizard/yuthon_property_wizard.py
+++ b/yuthon_property/wizard/yuthon_property_wizard.py
@@ -91,8 +91,11 @@ class YuthonPropertyWizard(models.Model):
             'yuthon_company': yuthon_company,
             'tenure_type': tenure_type,
             'state': state,
+            'title_deed':title_certificate,
             'precinct_id':precinct_id.id,
             'asset_type_id':asset_type_id.id,
+            'purpose_id':purpose_id.id,
+            'admin_id':admin_id.id,
             'live_room':live_room.id,
             'premises':premises,
             'street':street,