From 5bfb3302e6e5d932d7200500b7635eac896e9db0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 12 Nov 2025 18:51:57 +0800
Subject: [PATCH] =?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/models/inherit_yuthon_property.py    | 3 ++-
 .../views/inherit_yuthon_property_views.xml                   | 2 +-
 yuthon_property_approval/wizard/property_rental_wizard.py     | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/yuthon_property_approval/models/inherit_yuthon_property.py b/yuthon_property_approval/models/inherit_yuthon_property.py
index 48a74b1af..b94aafb93 100644
--- a/yuthon_property_approval/models/inherit_yuthon_property.py
+++ b/yuthon_property_approval/models/inherit_yuthon_property.py
@@ -996,7 +996,8 @@ class PropertyRentList(models.Model):
     contract_id = fields.Many2one('property.lease.contract', string="关联租赁合同审批")
     tenure_type = fields.Selection(related='contract_id.tenure_type', string="权属类型", store=True)
     property_address = fields.Text(string="物业信息", compute='get_property_address')
-    contract_sort = fields.Selection([('property', '物业'), ('guanggao', '广告位'),('parking', '停车场'), ('guanzi', '管子间'), ('room', '机房'), ('base_station','基站'), ('other', '其他')], string="资产类型")
+    contract_sort = fields.Selection(related='contract_id.contract_sort', string="资产类型", store=True) # 数据库存储问题，无意义
+    contract_sort1 = fields.Selection([('property', '物业'), ('guanggao', '广告位'),('parking', '停车场'), ('guanzi', '管子间'), ('room', '机房'), ('base_station','基站'), ('other', '其他')], string="资产类型", default='property')
     company_id = fields.Many2one(related='contract_id.lessor_id', string="出租方公司", store=True)
     is_company = fields.Boolean(string='是否是本公司', compute='_compute_is_company', store=False)
 
diff --git a/yuthon_property_approval/views/inherit_yuthon_property_views.xml b/yuthon_property_approval/views/inherit_yuthon_property_views.xml
index 6b4118040..acb082536 100644
--- a/yuthon_property_approval/views/inherit_yuthon_property_views.xml
+++ b/yuthon_property_approval/views/inherit_yuthon_property_views.xml
@@ -123,7 +123,7 @@
                 <field name="tenure_type"/>
                 <field name="contract_id"/>
                 <group expand="0" string="group_by">
-                    <filter name="contract_sort" string="资产类型" context="{'group_by':'contract_sort'}"/>
+                    <filter name="contract_sort1" string="资产类型" context="{'group_by':'contract_sort1'}"/>
                     <filter name="group_company_id" string="公司" context="{'group_by':'company_id'}"/>
                     <filter name="group_tenure_type" string="权属类型" context="{'group_by':'tenure_type'}"/>
                     <filter name="group_admin_id" string="管理员" context="{'group_by':'admin_id'}"/>
diff --git a/yuthon_property_approval/wizard/property_rental_wizard.py b/yuthon_property_approval/wizard/property_rental_wizard.py
index 9d5196a56..9136a3b4c 100644
--- a/yuthon_property_approval/wizard/property_rental_wizard.py
+++ b/yuthon_property_approval/wizard/property_rental_wizard.py
@@ -53,7 +53,7 @@ class PropertyRentalWizard(models.Model):
                 "contract_id": record.id,
                 "due_date": start_date,
                 'multiplier': multiplier,
-                "contract_sort": record.contract_sort,
+                "contract_sort1": record.contract_sort,
                 'acc_type': acc_type,
                 "lessee_id": record.lessee_id.id,
                 "property_id": property_id,
@@ -66,7 +66,7 @@ class PropertyRentalWizard(models.Model):
                 "contract_id": record.id,
                 "due_date": start_date,
                 'multiplier': multiplier,
-                "contract_sort": record.contract_sort,
+                "contract_sort1": record.contract_sort,
                 "lessee_id": record.lessee_id.id,
                 'acc_type': acc_type,
                 "property_id": property_id,