From b47f3a96231c7bcc70ea1fed2e84ac09a102ae9a Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Thu, 19 Jun 2025 16:18:02 +0800 Subject: [PATCH 01/12] =?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 --- attendance_iot/models/attendance_iot.py | 4 +--- attendance_iot/views/attendance_iot_user_views.xml | 2 +- yuthon_property/views/property_rent_list_views.xml | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/attendance_iot/models/attendance_iot.py b/attendance_iot/models/attendance_iot.py index a5754bd17..bc9115352 100644 --- a/attendance_iot/models/attendance_iot.py +++ b/attendance_iot/models/attendance_iot.py @@ -27,7 +27,5 @@ class AttendanceIot(models.Model): ('employee_id', 'in', self.employee_ids.ids), ('attendance_iot_id', '=', self.id), ], - 'context': { - 'group_by': ['attendance_iot_id'], - }, + 'context': {'group_by': ['company_id', 'attendance_iot_id']} } diff --git a/attendance_iot/views/attendance_iot_user_views.xml b/attendance_iot/views/attendance_iot_user_views.xml index 6ca4447f2..cf4ca2a85 100644 --- a/attendance_iot/views/attendance_iot_user_views.xml +++ b/attendance_iot/views/attendance_iot_user_views.xml @@ -7,7 +7,7 @@ - + diff --git a/yuthon_property/views/property_rent_list_views.xml b/yuthon_property/views/property_rent_list_views.xml index c9416bf6f..e4a574f90 100644 --- a/yuthon_property/views/property_rent_list_views.xml +++ b/yuthon_property/views/property_rent_list_views.xml @@ -8,6 +8,8 @@ decoration-success="charge_status == 'fully_paid'" js_class="custom_rent_list_button" limit="20"> + + @@ -31,6 +33,8 @@ + + From a52ca684a4809508189dca729c430592b66f7442 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Thu, 19 Jun 2025 17:42:04 +0800 Subject: [PATCH 02/12] =?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 | 60 ++++++++++++++----- .../views/yuthon_property_views.xml | 19 +++--- 2 files changed, 56 insertions(+), 23 deletions(-) diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py index c1d291533..a25e83b24 100644 --- a/yuthon_property/models/yuthon_property.py +++ b/yuthon_property/models/yuthon_property.py @@ -83,8 +83,6 @@ class YuthonProperty(models.Model): first_letter = fields.Char(string="首字母", compute='_compute_first_letter', store=True) - # 报表新增字段 - title_certificate = fields.Char(string="产权证号") vacant_duration = fields.Float(string="空置时长", digits=(16, 2)) @@ -108,7 +106,25 @@ class YuthonProperty(models.Model): if rec.title_information_ids: latest_title_information = sorted(rec.title_information_ids, key=lambda x: x.start_time, reverse=True)[0] rec.write({ - 'title_deed': latest_title_information.title_certificate}) + 'title_deed': latest_title_information.title_certificate, + 'registered_id': latest_title_information.registered_id, + 'equity_area': latest_title_information.equity_area, + }) + + @api.onchange('manage_information_ids') + def _onchange_information_ids(self): + for rec in self: + if rec.manage_information_ids: + latest_title_information = sorted(rec.manage_information_ids, key=lambda x: x.start_time, reverse=True)[ + 0] + rec.write({ + 'precinct_id': latest_title_information.precinct_id, + 'tenure_type': latest_title_information.tenure_type, + 'management_area': latest_title_information.management_area, + 'rent_area': latest_title_information.rent_area, + 'admin_id': latest_title_information.admin_id, + 'company_id' : latest_title_information.company_id, + }) @api.onchange('energy_meter_ids') def _onchange_energy_meter_ids(self): @@ -164,6 +180,15 @@ class YuthonProperty(models.Model): "context": {'default_property_rental_form_line_ids': property_list} } + def open_record(self): + return { + "type": "ir.actions.act_window", + "res_model": 'yuthon.property', + "res_id": self.id, + "name": '物业详情', + "view_mode": "form", + } + def put_offline_approval(self): form_id = self.env.ref('yuthon_property_approval.view_property_offline_registration_form').id return { @@ -177,6 +202,7 @@ class YuthonProperty(models.Model): } } + def put_adjustment_approval(self): form_id = self.env.ref('yuthon_property_approval.view_property_rental_conditions_form').id return { @@ -247,11 +273,11 @@ class YuthonProperty(models.Model): 'name': record.name, 'property_ids': [(6, 0, [record.id])], 'evaluation_area': record.rent_area, - 'owner_id': record.title_information_ids[0].owner_id.id if record.title_information_ids else None, - 'registered_id': record.title_information_ids[0].registered_id.id if record.title_information_ids else None, - 'rent_id': record.reference_ids[0].rent_id.id if record.reference_ids else None, - 'lease_period': record.reference_ids[0].lease_period if record.reference_ids else None, - 'annual_increase_percentage': record.reference_ids[0].annual_increase_percentage if record.reference_ids else None, + 'owner_id': record.title_information_ids[-1].owner_id.id if record.title_information_ids else None, + 'registered_id': record.title_information_ids[-1].registered_id.id if record.title_information_ids else None, + 'rent_id': record.reference_ids[-1].rent_id.id if record.reference_ids else None, + 'lease_period': record.reference_ids[-1].lease_period if record.reference_ids else None, + 'annual_increase_percentage': record.reference_ids[-1].annual_increase_percentage if record.reference_ids else None, 'assessment_category': 'rent_money', 'remake': record.remark, }) @@ -273,11 +299,11 @@ class YuthonProperty(models.Model): 'name': record.name, 'property_ids': [(6, 0, [record.id])], 'evaluation_area': record.rent_area, - 'owner_id': record.title_information_ids[0].owner_id.id if record.title_information_ids else None, - 'registered_id': record.title_information_ids[0].registered_id.id if record.title_information_ids else None, - 'rent_id': record.reference_ids[0].rent_id.id if record.reference_ids else None, - 'lease_period': record.reference_ids[0].lease_period if record.reference_ids else None, - 'annual_increase_percentage': record.reference_ids[0].annual_increase_percentage if record.reference_ids else None, + 'owner_id': record.title_information_ids[-1].owner_id.id if record.title_information_ids else None, + 'registered_id': record.title_information_ids[-1].registered_id.id if record.title_information_ids else None, + 'rent_id': record.reference_ids[-1].rent_id.id if record.reference_ids else None, + 'lease_period': record.reference_ids[-1].lease_period if record.reference_ids else None, + 'annual_increase_percentage': record.reference_ids[-1].annual_increase_percentage if record.reference_ids else None, 'assessment_category': 'rent_money', 'remake': record.remark, }) @@ -346,13 +372,15 @@ class YuthonProperty(models.Model): self._context.get('active_ids', self._context.get('active_id'))) for record in property_ids: precinct_id = self.env["yuthon.precinct.message"].search([('employee_id.name', '=', record.admin_id.name)]) - company_id = record.manage_information_ids[0].company_id.id if record.manage_information_ids else '' - title_deed = record.title_information_ids[0].title_certificate if record.title_information_ids else '' + company_id = record.manage_information_ids[-1].company_id.id if record.manage_information_ids else '' + title_deed = record.title_information_ids[-1].title_certificate if record.title_information_ids else '' + registered_id = record.title_information_ids[-1].registered_id if record.title_information_ids else '' + record.registered_id = registered_id record.company_id = company_id record.title_deed = title_deed record.precinct_id = precinct_id.id if precinct_id else '' if record.manage_information_ids: - record.manage_information_ids[0].precinct_id = precinct_id.id if precinct_id else '' + record.manage_information_ids[-1].precinct_id = precinct_id.id if precinct_id else '' def revert_change(self): property_ids = self.env["yuthon.property"].browse( diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml index 7164e84df..abd77827b 100644 --- a/yuthon_property/views/yuthon_property_views.xml +++ b/yuthon_property/views/yuthon_property_views.xml @@ -276,11 +276,11 @@ - - - - - + + + + + @@ -344,14 +344,15 @@ yuthon.property - + - + +