pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加功能

Browse Source
This commit is contained in:
李鹏宇
2025-10-15 19:58:16 +08:00
parent 01e02f4ac0
commit bb09bb943f
7 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property/models/property_meter_archives.py
+9 -1
View File
@@ -64,7 +64,6 @@ class PropertyMeterArchives(models.Model):
raise ValidationError(
f"仪表编号 '{vals['name']}' 已存在，请使用其他编号！"
)
record.archives_state = "rent" if record.lessee_id else "use"
return record
def update_epitope_values(self):
@@ -225,6 +224,7 @@ class MeterArchivesLine(models.Model):
related="archives_id.sequence1", string="表序号", store=True
)
epitope_values_id = fields.Many2one("yuthon.epitope.values", string="表位置")
lessee_id = fields.Many2one("property.tenant.information", string="承租方")
yuthon_property_ids = fields.Many2many("yuthon.property", string="物业信息")
last_meter = fields.Date(string="上次抄表日期", compute="_compute_last")
last_dosage = fields.Float(
@@ -356,6 +356,14 @@ class MeterArchivesLine(models.Model):
f"输入错误：仪表编号为{record.archives_id.name}当前读数 {record.current_read} 必须大于上次读数 {record.last_read} "
)
@api.onchange("yuthon_property_ids")
def compute_lessee_id(self):
for record in self:
if record.yuthon_property_ids:
record.lessee_id = record.yuthon_property_ids[0].lessee_id
else:
record.lessee_id = False
def update_date(self):
meter_ids = self.env["meter.archives.line"].browse(
self._context.get("active_ids", self._context.get("active_id"))
yuthon_property/models/property_meter_water.py
+2 -2
View File
@@ -65,7 +65,6 @@ class PropertyMeterWater(models.Model):
raise ValidationError(
f"仪表编号 '{vals['name']}' 已存在，请使用其他编号！"
)
record.water_state = "rent" if record.lessee_id else "use"
return record
def update_epitope_values(self):
@@ -115,7 +114,7 @@ class PropertyMeterWater(models.Model):
return
self.line_ids.write({
'yuthon_property_ids': [(6, 0, self.yuthon_property_ids.ids)] if self.yuthon_property_ids else [],
'epitope_values_id': self.epitope_values_id.id if self.epitope_values_id else False
'epitope_values_id': self.epitope_values_id.id
})
self.update_epitope_values()
@@ -183,6 +182,7 @@ class MeterWaterLine(models.Model):
)
sequence = fields.Integer(related="water_id.sequence1", string="表序号", store=True)
epitope_values_id = fields.Many2one("yuthon.epitope.values", string="表位置")
lessee_id = fields.Many2one("property.tenant.information", string="承租方")
yuthon_property_ids = fields.Many2many("yuthon.property", string="物业信息")
last_meter = fields.Date(string="上次抄表日期", compute="_compute_last")
last_dosage = fields.Float(
yuthon_property/models/yuthon_property.py
+1
View File
@@ -58,6 +58,7 @@ class YuthonProperty(models.Model):
suite_area = fields.Float(string="套内面积", digits=(16, 4))
purpose_id = fields.Many2one('yuthon.resource.purpose', string="管理类型", compute="compute_information_fields", store=True)
admin_id = fields.Many2one('res.users', string="片区管理员", compute="compute_information_fields", store=True)
lessee_id = fields.Many2one('property.tenant.information', string='承租方')
title_address = fields.Many2one('yuthon.property.message', string="产权地址", compute="_compute_title_information_fields", store=True)
company_id = fields.Many2one('yuthon.property.company', string="公司", compute="compute_information_fields", store=True)
rental_address = fields.Text(string="出租地址")
yuthon_property/views/property_meter_archives_views.xml
+1
View File
@@ -102,6 +102,7 @@
<field name="receivables"/>
<field name="number" column_invisible="1"/>
<field name="yuthon_property_ids" string="地址" readonly="1" widget="many2many_tags" options="{'no_open': True}"/>
<field name="lessee_id" options="{'no_create': True, 'no_open': True}" readonly="1"/>
<field name="epitope_values_id" domain="[('type', '=', 'watermeter')]" options="{'no_open': True}"/>
<field name="last_meter" readonly="1"/>
<field name="last_dosage" readonly="1"/>
yuthon_property/views/property_meter_water_views.xml
+1
View File
@@ -109,6 +109,7 @@
<field name="receivables"/>
<field name="number" column_invisible="1"/>
<field name="yuthon_property_ids" string="地址" readonly="1" widget="many2many_tags" options="{'no_create': True, 'no_open': True}"/>
<field name="lessee_id" options="{'no_create': True, 'no_open': True}" readonly="1"/>
<field name="epitope_values_id" domain="[('type', '=', 'watermeter')]" options="{'no_create': True, 'no_open': True}"/>
<field name="last_meter" readonly="1"/>
<field name="last_dosage" readonly="1"/>
yuthon_property/views/yuthon_property_views.xml
+1
View File
@@ -88,6 +88,7 @@
<field name="title_deed" invisible="1"/>
<field name="purpose_id" invisible="1"/>
<field name="admin_id" invisible="1"/>
<field name="lessee_id" invisible="1"/>
<field name="house_type_id" options="{'no_open': True}"/>
<field name="property_source"/>
<field name="district"/>
yuthon_property_approval/views/inherit_yuthon_property_views.xml
-2
View File
@@ -26,7 +26,6 @@
<field name="inherit_id" ref="yuthon_property.view_meter_archives_line_tree"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='yuthon_property_ids']" position="after">
<field name="lessee_id" options="{'no_create': True, 'no_open': True}" readonly="1"/>
<field name="contract_id"/>
</xpath>
</field>
@@ -37,7 +36,6 @@
<field name="inherit_id" ref="yuthon_property.view_meter_water_line_tree"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='yuthon_property_ids']" position="after">
<field name="lessee_id" options="{'no_create': True, 'no_open': True}" readonly="1"/>
<field name="contract_id"/>
</xpath>
</field>