From 46acae518b9acdd74f5de3f7e3be44d0c6c4f54f Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 7 Aug 2025 19:52:20 +0800
Subject: [PATCH 1/2] =?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

---
 .../models/property_lease_contract.py                |  1 +
 .../views/inherit_yuthon_property_views.xml          |  3 +++
 .../views/property_lease_contract.xml                | 12 +++++++++---
 .../wizard/choose_property_wizard.py                 |  8 +++++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py
index b0e23bd3a..01177be3f 100644
--- a/yuthon_property_approval/models/property_lease_contract.py
+++ b/yuthon_property_approval/models/property_lease_contract.py
@@ -212,6 +212,7 @@ 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="产权证信息")
 
     @api.depends()
     def _compute_not_received(self):
diff --git a/yuthon_property_approval/views/inherit_yuthon_property_views.xml b/yuthon_property_approval/views/inherit_yuthon_property_views.xml
index bffc0bd66..5f8652a04 100644
--- a/yuthon_property_approval/views/inherit_yuthon_property_views.xml
+++ b/yuthon_property_approval/views/inherit_yuthon_property_views.xml
@@ -34,6 +34,9 @@
         <field name="model">property.rent.list</field>
         <field name="arch" type="xml">
             <search>
+                 <field name="property_id"
+                       string="综合搜索"
+                       filter_domain="['|', '|', ('property_id.name', 'ilike', self), ('lessee_id.name', 'ilike', self), ('contract_id.contract_code', 'ilike', self)]"/>
                 <field name="property_id"/>
                 <field name="lessee_id"/>
                 <field name="contract_id"/>
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 49074b2fa..15477b496 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -75,6 +75,7 @@
                             <field name="name" readonly="0"/>
                             <field name="use_address" readonly="0"/>
                             <field name="address_for_delivery" readonly="0"/>
+                            <field name="title_information" readonly="1"/>
                             <field name="title_address"/>
                             <field name="handling_opinions"/>
                             <field name="tenure_type" invisible="1"/>
@@ -560,12 +561,17 @@
                             <label for="term_start_time"/>
                             <div class="d-inline-flex w-100">
                                 <field name="term_start_time" class="me-2" style="max-width: 11rem !important;"
-                                       readonly="1"/>结束时间
+                                       readonly="1"/>至
                                 <field name="term_end_time" class="me-2" style="max-width: 11rem !important;"
                                        readonly="1" force_save="1"/>
                             </div>
-                            <field name="actual_start_time"/>
-                            <field name="actual_end_time"/>
+                            <label for="actual_start_time"/>
+                            <div class="d-inline-flex w-100">
+                                <field name="actual_start_time" class="me-2" style="max-width: 11rem !important;"
+                                       readonly="1"/>至
+                                <field name="actual_end_time" class="me-2" style="max-width: 11rem !important;"
+                                       readonly="1" force_save="1"/>
+                            </div>
                             <label for="cycle_mode"/>
                             <div class="d-inline-flex w-100">
                                 <field name="cycle_mode" class="me-2"
diff --git a/yuthon_property_approval/wizard/choose_property_wizard.py b/yuthon_property_approval/wizard/choose_property_wizard.py
index 1eb960384..cbea90384 100644
--- a/yuthon_property_approval/wizard/choose_property_wizard.py
+++ b/yuthon_property_approval/wizard/choose_property_wizard.py
@@ -23,8 +23,11 @@ class ChoosePropertyWizard(models.Model):
         lease_name = []
         lease_ids_to_add = []
         fee_list = []
+        title_deed = []
         for record in self.property_ids:
             lease_name.append(record.name)
+            if record.title_deed != '无产权':
+                title_deed.append(record.title_deed)
             lease_ids_to_add.append((0, 0, {
                 "lease_id": self.lease_contract_id.id,
                 "address_id": record.id,
@@ -50,12 +53,15 @@ class ChoosePropertyWizard(models.Model):
             rec.company_id = company_id
             rec.precinct_id = precinct_id
         existing_names = [lease.address_id.name for lease in self.lease_contract_id.lease_ids if lease.address_id]
-        all_names = list(set(existing_names + lease_name))  # 去重
+        information_names = [lease.address_id.title_deed for lease in self.lease_contract_id.lease_ids if lease.address_id and lease.address_id.title_deed != '无产权']
+        all_names = list(set(existing_names + lease_name))
+        title_information =  list(set(information_names + title_deed))
         existing_lease_ids = [(4, lease.id) for lease in self.lease_contract_id.lease_ids]
         self.lease_contract_id.lease_ids = existing_lease_ids + lease_ids_to_add
         self.lease_contract_id.write({'name': ','.join(all_names),
                                       '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])})
 
 

From 636b814466e8ffca903820c12f7be5d4a9d49c14 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 7 Aug 2025 19:52:53 +0800
Subject: [PATCH 2/2] =?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_approval/views/property_lease_contract.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 15477b496..7fe93cb8d 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -466,6 +466,7 @@
                             <field name="deposit_status" invisible="1"/>
                             <field name="tenure_type" invisible="1"/>
                             <field name="address_for_delivery" readonly="0"/>
+                            <field name="title_information" readonly="1"/>
                             <field name="condition" invisible="1" readonly="0"/>
                             <field name="is_equal" invisible="1"/>
                             <field name="end_comparison" invisible="1"/>