diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py index 4849f7c9b..b7bedf3a1 100644 --- a/yuthon_property/models/yuthon_property.py +++ b/yuthon_property/models/yuthon_property.py @@ -65,7 +65,6 @@ class YuthonProperty(models.Model): equity_area = fields.Float(string="产权面积", group_operator=None, digits=(16, 4)) decoration_type = fields.Selection([('blank', '毛坯'), ('hardcover', '精装'), ('brands', '简装'), ('rsz', '豪装')], string="装修类型") - bank_statements_ids = fields.One2many('property.bank.statements', 'property_id', string="银行流水") water_meter_ids = fields.One2many('yuthon.property.water', 'yuthon_property_id', string='水表列表') energy_meter_ids = fields.One2many('yuthon.property.energy', 'yuthon_property_id', string='电表列表') title_information_ids = fields.One2many('title.information.line', 'yuthon_property_id', string='关联产权信息明细行') @@ -73,6 +72,9 @@ class YuthonProperty(models.Model): string='关联管理信息明细行') disassembly_information_ids = fields.One2many('disassembly.information.line', 'yuthon_property_id', string='关联拆分信息明细行') + assessment_ids = fields.One2many('yuthon.property.assessment', 'yuthon_property_id', string='关联评估明细行') + repair_ids = fields.One2many('yuthon.property.repair', 'yuthon_property_id', string='关联维修明细行') + produce_ids = fields.One2many('yuthon.property.produce', 'yuthon_property_id', string='关联安全生产明细行') property_merge_approval_id = fields.Many2one('yuthon.property', string='关联物业信息') @api.onchange('title_information_ids') @@ -359,4 +361,25 @@ class DisassemblyInformationLine(models.Model): end_date = fields.Date(string="失效日期") +class YuthonPropertyAssessment(models.Model): + _name = 'yuthon.property.assessment' + _description = '物业评估' + yuthon_property_id = fields.Many2one('yuthon.property', string="关联物业信息") + name = fields.Char(string="评估名称") + + +class YuthonPropertyRepair(models.Model): + _name = 'yuthon.property.repair' + _description = '维修' + + yuthon_property_id = fields.Many2one('yuthon.property', string="关联物业信息") + name = fields.Char(string="维修名称") + + +class YuthonPropertyProduce(models.Model): + _name = 'yuthon.property.produce' + _description = '安全生产' + + yuthon_property_id = fields.Many2one('yuthon.property', string="关联物业信息") + 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 14989260f..f45cc0492 100644 --- a/yuthon_property/security/ir.model.access.csv +++ b/yuthon_property/security/ir.model.access.csv @@ -65,4 +65,7 @@ access_property_statements_wizard,property_statements_wizard,model_property_stat access_property_bank_line,property_bank_line,model_property_bank_line,base.group_user,1,1,1,1 access_property_electric_reading,property_electric_reading,model_property_electric_reading,base.group_user,1,1,1,1 access_property_water_reading,property_water_reading,model_property_water_reading,base.group_user,1,1,1,1 -access_property_deposit_list,property_deposit_list,model_property_deposit_list,base.group_user,1,1,1,1 \ No newline at end of file +access_property_deposit_list,property_deposit_list,model_property_deposit_list,base.group_user,1,1,1,1 +access_yuthon_property_assessment,yuthon_property_assessment,model_yuthon_property_assessment,base.group_user,1,1,1,1 +access_yuthon_property_repair,yuthon_property_repair,model_yuthon_property_repair,base.group_user,1,1,1,1 +access_yuthon_property_produce,yuthon_property_produce,model_yuthon_property_produce,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml index 8fc87273a..f414ab399 100644 --- a/yuthon_property/views/yuthon_property_views.xml +++ b/yuthon_property/views/yuthon_property_views.xml @@ -146,20 +146,6 @@ - - - - - - - - - - - - - - @@ -183,6 +169,30 @@ + + + + + + + + + + + + + + + + + + + + + + + +