From 0b40b75a1b42fcfe31e6f1a1e065e5be8193da97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Mon, 2 Mar 2026 21:44:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_report/models/receivable_report.py | 10 +++++----- yuthon_report/views/receivable_report_views.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/yuthon_report/models/receivable_report.py b/yuthon_report/models/receivable_report.py index cc3a63332..bd2fe5729 100644 --- a/yuthon_report/models/receivable_report.py +++ b/yuthon_report/models/receivable_report.py @@ -65,6 +65,11 @@ class YuthonProperty(models.Model): "应收开始": rec.due_date.strftime("%Y-%m-%d") if rec.due_date else "", "应收结束": rec.due_date_end.strftime("%Y-%m-%d") if rec.due_date_end else "", "当期金额": round(amount, 2), + "合同编号": { + 'model': 'property.lease.contract', + 'id': rec.contract_id.id, + 'display_name': rec.contract_id.contract_code, + } if rec.contract_id else "", "承租方": { 'model': 'property.tenant.information', 'id': rec.lessee_id.id, @@ -72,11 +77,6 @@ class YuthonProperty(models.Model): } if rec.lessee_id else "", "物业名称": rec.property_name or "", "产权证号": rec.title_deed or "", - "合同编号": { - 'model': 'property.lease.contract', - 'id': rec.contract_id.id, - 'display_name': rec.contract_id.contract_code, - } if rec.contract_id else "", "发票类型": invoice_type_map.get(rec.invoice_type, ""), "税率": ( lambda tr: ( diff --git a/yuthon_report/views/receivable_report_views.xml b/yuthon_report/views/receivable_report_views.xml index 55f2fe90b..132782f32 100644 --- a/yuthon_report/views/receivable_report_views.xml +++ b/yuthon_report/views/receivable_report_views.xml @@ -15,10 +15,10 @@ {"headerName": "应收开始", "field": "应收开始", "flex": 1}, {"headerName": "应收结束", "field": "应收结束", "flex": 1}, {"headerName": "当期金额", "field": "当期金额", "flex": 1, "type": "number"}, + {"headerName": "合同编号", "field": "合同编号", "flex": 1}, {"headerName": "承租方", "field": "承租方", "flex": 1}, {"headerName": "物业名称", "field": "物业名称", "flex": 1}, {"headerName": "产权证号", "field": "产权证号", "flex": 1}, - {"headerName": "合同编号", "field": "合同编号", "flex": 1}, {"headerName": "发票类型", "field": "发票类型", "flex": 1}, {"headerName": "税率", "field": "税率", "flex": 1} ]