diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py
index 83b10fa59..cf9337b00 100644
--- a/yuthon_property/models/yuthon_property.py
+++ b/yuthon_property/models/yuthon_property.py
@@ -40,8 +40,10 @@ class YuthonProperty(models.Model):
('filing', '备案中'), ('net', '挂网'), ('signing', '签约中'),
('signed', '已备案'), ('leased', '已租'), ('idle', '空置'), ('no_lease','不可租')], string='资产目前状态', default='to')
is_meter = fields.Boolean(string="水表")
+ meter_id = fields.Many2one('yuthon.water.setting', string="水费标准配置")
live_room = fields.Many2one('yuthon.live.room', string="居住用房")
is_electricity_meter = fields.Boolean(string="电表")
+ electricity_id = fields.Many2one('yuthon.electricity.setting', string="电费标准配置")
admin_id = fields.Many2one('res.users', string="管理员")
purpose_id = fields.Many2one('yuthon.resource.purpose', string="管理类型")
is_confirm_authorization = fields.Boolean(string="确权")
@@ -61,12 +63,12 @@ class YuthonProperty(models.Model):
code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_message_code'))
rental_unit_price = fields.Float(string="评估单价")
address = fields.Text(string="物业地址")
+ equity_area = fields.Float(string="产权面积")
title_number = fields.Char(string="产权编号")
suite_area = fields.Float(string="套内面积")
start_time = fields.Date(string="生效时间")
end_date = fields.Date(string="失效日期")
lessee_id = fields.Many2one('yuthon.property.lessee', string='承租方')
- manage_standard = fields.Char(string="物业管理费标准")
title_address = fields.Many2one('yuthon.property.message', string="产权地址")
rental_address = fields.Text(string="出租地址")
ame = fields.Char(string='标题')
@@ -80,6 +82,7 @@ class YuthonProperty(models.Model):
disassembly_information_ids = fields.One2many('disassembly.information.line', 'yuthon_property_id',
string='关联拆分信息明细行')
property_merge_approval_id = fields.Many2one('yuthon.property', string='关联物业信息')
+ manage_fee_line_ids = fields.One2many('manage.information.fee.line', 'yuthon_property_id', string='关联管理费明细行')
@api.onchange('building_area')
def _onchange_building_area(self):
@@ -319,3 +322,10 @@ class DisassemblyInformationLine(models.Model):
start_time = fields.Date(related='property_id.start_time',string="生效日期")
end_date = fields.Date(related='property_id.end_date',string="失效日期")
+class ManageInformationFeeLine(models.Model):
+ _name = 'manage.information.fee.line'
+ _description = '管理费用明细行'
+
+ yuthon_property_id = fields.Many2one('yuthon.property', string="关联物业信息")
+ manage_id = fields.Many2one('property.message.fee', string="管理费标准")
+
diff --git a/yuthon_property/models/yuthon_resource_mgmt_config.py b/yuthon_property/models/yuthon_resource_mgmt_config.py
index 00fe6cf8a..4860b2a9d 100644
--- a/yuthon_property/models/yuthon_resource_mgmt_config.py
+++ b/yuthon_property/models/yuthon_resource_mgmt_config.py
@@ -61,3 +61,21 @@ class YuthonLiveRoom(models.Model):
_description = '居住用房'
name = fields.Char(string="居住用房")
+
+class YuthonElectricitySetting(models.Model):
+ _name = 'yuthon.electricity.setting'
+ _description = '电费标准配置'
+
+ name = fields.Char(string="电费标准")
+
+class YuthonWaterSetting(models.Model):
+ _name = 'yuthon.water.setting'
+ _description = '水费标准配置'
+
+ name = fields.Char(string="水费标准")
+
+class YuthonPropertySetting(models.Model):
+ _name = 'yuthon.property.setting'
+ _description = '物业费标准配置'
+
+ name = fields.Char(string="物业费标准")
\ No newline at end of file
diff --git a/yuthon_property/security/ir.model.access.csv b/yuthon_property/security/ir.model.access.csv
index c0eb58d17..18b221d3c 100644
--- a/yuthon_property/security/ir.model.access.csv
+++ b/yuthon_property/security/ir.model.access.csv
@@ -47,4 +47,8 @@ access_yuthon_tariff_setting,yuthon_tariff_setting,model_yuthon_tariff_setting,b
access_yuthon_live_room,yuthon_live_room,model_yuthon_live_room,base.group_user,1,1,1,1
access_yuthon_precinct_message,yuthon_precinct_message,model_yuthon_precinct_message,base.group_user,1,1,1,1
access_yuthon_property_message,yuthon_property_message,model_yuthon_property_message,base.group_user,1,1,1,1
-access_yuthon_property_lessee,yuthon_property_lessee,model_yuthon_property_lessee,base.group_user,1,1,1,1
\ No newline at end of file
+access_yuthon_property_lessee, yuthon_property_lessee,model_yuthon_property_lessee,base.group_user,1,1,1,1
+access_yuthon_property_lessee,yuthon_property_lessee,model_yuthon_property_lessee,base.group_user,1,1,1,1
+access_yuthon_electricity_setting,yuthon_electricity_setting,model_yuthon_electricity_setting,base.group_user,1,1,1,1
+access_yuthon_water_setting,yuthon_water_setting,model_yuthon_water_setting,base.group_user,1,1,1,1
+access_manage_information_fee_line,manage.information.fee.line,model_manage_information_fee_line,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml
index 09f77f203..d05e298b8 100644
--- a/yuthon_property/views/menuitem.xml
+++ b/yuthon_property/views/menuitem.xml
@@ -330,6 +330,11 @@
action="yuthon_property_penalty_action" sequence="37"/>
+
+
+
diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index 5259ecf05..0eef3a4f5 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -61,20 +61,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -82,12 +68,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -131,9 +132,12 @@
+
+
+
@@ -179,6 +183,14 @@
+
+
+
+
+
+
+
+
diff --git a/yuthon_property/views/yuthon_resource_mgmt_config_views.xml b/yuthon_property/views/yuthon_resource_mgmt_config_views.xml
index b9f983569..8b126753b 100644
--- a/yuthon_property/views/yuthon_resource_mgmt_config_views.xml
+++ b/yuthon_property/views/yuthon_resource_mgmt_config_views.xml
@@ -132,4 +132,32 @@
yuthon.live.room
tree
+
+ yuthon.electricity.setting.tree
+ yuthon.electricity.setting
+
+
+
+
+
+
+
+ 电费标准配置
+ yuthon.electricity.setting
+ tree
+
+
+ yuthon.water.setting.tree
+ yuthon.water.setting
+
+
+
+
+
+
+
+ 水费标准配置
+ yuthon.water.setting
+ tree
+