!6121 添加功能

Merge pull request !6121 from 李鹏宇/dev_zhou

yuthon_property/models/yuthon_property.py

@@ -579,24 +579,12 @@ class YuthonPropertyWater(models.Model):
 
     property_meter_water_id = fields.Many2one('property.meter.water', string="水表库")
     rate = fields.Integer(related='property_meter_water_id.gauge_magnification', string="倍率", store=True)
-    unit_number = fields.Char(related='property_meter_water_id.unit_number', string="单元编号/用途")
-    start_date = fields.Date(string="开始日期")
-    end_date = fields.Date(string="结束日期")
+    standard_id = fields.Many2one(related='property_meter_water_id.standards_id', string="标准", store=True)
+    installation_date = fields.Date(related='property_meter_water_id.start_time', string="安装日期")
+    demolition_date = fields.Date(related='property_meter_water_id.end_time', string="拆除日期")
     epitope_values_id = fields.Many2one(related='property_meter_water_id.epitope_values_id', string="位置")
     yuthon_property_id = fields.Many2one('yuthon.property', string="物业管理")
 
-    @api.depends('property_meter_water_id')
-    def _compute_date(self):
-        for record in self:
-            if record.property_meter_water_id.yuthon_property_ids:
-                contract_id = record.env['property.lease.contract.line'].search(
-                    [('address_id', '=', record.property_meter_water_id.yuthon_property_ids[0].id),
-                     ('lease_id.contact_state', '=', 'ing')])
-                if contract_id:
-                    record.start_date = contract_id[0].term_start_time
-                    record.end_date = contract_id[0].term_end_time
-
-
     # 水表跳转
     def detail(self):
         return {
@@ -638,6 +626,9 @@ class YuthonPropertyEnergy(models.Model):
                 if contract_id:
                     record.start_date = contract_id[0].term_start_time
                     record.end_date = contract_id[0].term_end_time
+                else:
+                    record.start_date = None
+                    record.end_date = None
 
     # 电表跳转
     def detail(self):

yuthon_property/views/yuthon_property_views.xml

@@ -246,11 +246,11 @@
                             <field name="energy_meter_ids" readonly="1">
                                 <tree editable="bottom">
                                     <field name="yuthon_property_id" column_invisible="1"/>
-                                    <field name="property_meter_archives_id" options="{'no_open': True}" string="电表编号"/>
+                                    <field name="property_meter_water_id" options="{'no_open': True}"/>
                                     <field name="rate"/>
-                                    <field name="unit_number"/>
-                                    <field name="start_date"/>
-                                    <field name="end_date"/>
+                                    <field name="standard_id" options="{'no_open': True}"/>
+                                    <field name="installation_date"/>
+                                    <field name="demolition_date"/>
                                     <field name="epitope_values_id"/>
                                     <button name="detail" type="object" class="btn btn-warning" string="详情"/>
                                     <button name="unlink" type="object" class="btn btn-danger" string="删除"/>danger
@@ -262,11 +262,11 @@
                             <field name="water_meter_ids" readonly="1">
                                 <tree editable="bottom">
                                     <field name="yuthon_property_id" column_invisible="1"/>
-                                    <field name="property_meter_water_id" options="{'no_open': True}" string="水表编号"/>
+                                    <field name="property_meter_archives_id" options="{'no_open': True}"/>
                                     <field name="rate"/>
-                                    <field name="unit_number"/>
-                                    <field name="start_date"/>
-                                    <field name="end_date"/>
+                                    <field name="standard_id" options="{'no_open': True}"/>
+                                    <field name="installation_date"/>
+                                    <field name="demolition_date"/>
                                     <field name="epitope_values_id"/>
                                     <button name="detail" type="object" class="btn btn-warning" string="详情"/>
                                     <button name="unlink" type="object" class="btn btn-danger" string="删除"/>

yuthon_property_approval/models/property_lease_contract.py

@@ -2104,9 +2104,9 @@ class PropertyWaterFeeLine(models.Model):
     contract_id = fields.Many2one('property.lease.contract', string="关联租赁合同审批")
     property_meter_water_id = fields.Many2one('property.meter.water', string="水表库")
     rate = fields.Integer(related='property_meter_water_id.gauge_magnification', string="倍率", store=True)
-    standard_id = fields.Many2one(related='property_meter_water_id.standards_id', string="标准", store=True)
-    installation_date = fields.Date(related='property_meter_water_id.start_time', string="安装日期")
-    demolition_date = fields.Date(related='property_meter_water_id.end_time', string="拆除日期")
+    unit_number = fields.Char(related='property_meter_water_id.unit_number', string="单元编号/用途", store=True)
+    start_date = fields.Date(related='contract_id.term_start_time', string="开始日期")
+    end_date = fields.Date(related='contract_id.term_end_time', string="结束日期")
     location = fields.Char(related='property_meter_water_id.installation_location', string="位置")
 
 class PropertyElectricFeeLine(models.Model):
@@ -2116,9 +2116,9 @@ class PropertyElectricFeeLine(models.Model):
     contract_id = fields.Many2one('property.lease.contract', string="关联租赁合同审批")
     property_meter_archives_id = fields.Many2one('property.meter.archives', string="电表编号")
     rate = fields.Integer(related='property_meter_archives_id.gauge_magnification', 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="拆除日期")
+    unit_number = fields.Char(related='property_meter_archives_id.unit_number', string="单元编号/用途", store=True)
+    start_date = fields.Date(related='contract_id.term_start_time', string="开始日期")
+    end_date = fields.Date(related='contract_id.term_end_time', string="结束日期")
     location = fields.Char(related='property_meter_archives_id.installation_location', string="位置")
 
 

yuthon_property_approval/views/property_lease_contract.xml

@@ -282,9 +282,9 @@
                                     <field name="contract_id" column_invisible="1"/>
                                     <field name="property_meter_water_id" options="{'no_open': True}"/>
                                     <field name="rate"/>
-                                    <field name="standard_id" options="{'no_open': True}"/>
-                                    <field name="installation_date"/>
-                                    <field name="demolition_date"/>
+                                    <field name="unit_number"/>
+                                    <field name="start_date"/>
+                                    <field name="end_date"/>
                                     <field name="location"/>
                                 </tree>
                             </field>
@@ -295,9 +295,9 @@
                                     <field name="contract_id" column_invisible="1"/>
                                     <field name="property_meter_archives_id" options="{'no_open': True}"/>
                                     <field name="rate"/>
-                                    <field name="standard_id" options="{'no_open': True}"/>
-                                    <field name="installation_date"/>
-                                    <field name="demolition_date"/>
+                                    <field name="unit_number"/>
+                                    <field name="start_date"/>
+                                    <field name="end_date"/>
                                     <field name="location"/>
                                 </tree>
                             </field>