!5061 添加功能

Merge pull request !5061 from 李鹏宇/dev_zhou

yuthon_property_approval/models/property_lease_contract.py

@@ -216,11 +216,24 @@ class PropertyLeaseContract(models.Model):
     responsibility_book_name = fields.Char(string="安全生产责任书(住宅)名称", compute='_compute_attachment_names',
                                            store=True)
     self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])])
-    title_information = fields.Text(string="产权证信息")
+    title_information = fields.Text(string="产权证信息", compute='_compute_title_information')
     contract_count = fields.Integer(string="联系人数量", compute='_compute_contract_count')
     reconciliation_count = fields.Integer(string="对账数量", compute='_compute_reconciliation_count')
     process_count = fields.Integer(string="流程数量", compute='_compute_process_count')
 
+    @api.depends('lease_ids.address_id.title_deed')
+    def _compute_title_information(self):
+        for record in self:
+            seen_titles = set()
+            unique_titles = []
+            for lease in record.lease_ids:
+                if lease.address_id and lease.address_id.title_deed:
+                    title = lease.address_id.title_deed.strip()
+                    if title and title not in seen_titles:
+                        seen_titles.add(title)
+                        unique_titles.append(title)
+            record.title_information = ', '.join(unique_titles)
+
     def contract_signature(self):
         return {
             'type': 'ir.actions.act_window',

yuthon_property_approval/wizard/choose_property_wizard.py

@@ -66,12 +66,6 @@ class ChoosePropertyWizard(models.Model):
                 name_val = lease.address_id.name
                 existing_names.append(name_val if name_val is not None else "无")
 
-        information_names = []
-        for lease in self.lease_contract_id.lease_ids:
-            if lease.address_id and lease.address_id.title_deed != '无产权':
-                deed_val = lease.address_id.title_deed
-                information_names.append(str(deed_val) if deed_val is not None else "无")
-
         title_name = []
         for lease in self.lease_contract_id.lease_ids:
             if lease.address_id:
@@ -80,7 +74,6 @@ class ChoosePropertyWizard(models.Model):
 
         # 过滤空字符串，避免拼接时出现空内容
         all_names = [name for name in list(set(existing_names + lease_name)) if name]
-        title_information = [info for info in list(set(information_names + title_deed))]
         title_address_combined = [addr for addr in list(set(title_address + title_name)) if addr]
 
         existing_lease_ids = [(4, lease.id) for lease in self.lease_contract_id.lease_ids]
@@ -94,7 +87,6 @@ class ChoosePropertyWizard(models.Model):
             if self.lease_contract_id.lease_ids else False,
             'use_address': ','.join(all_names),
             'address_for_delivery': ','.join(all_names),
-            'title_information': ','.join(title_information),
             'total_area': sum([lease.property_area for lease in rec.lease_ids])
         })