diff --git a/yuthon_report/models/deposit_cum_arrears_report.py b/yuthon_report/models/deposit_cum_arrears_report.py index 1d540e6f7..76b3faa65 100644 --- a/yuthon_report/models/deposit_cum_arrears_report.py +++ b/yuthon_report/models/deposit_cum_arrears_report.py @@ -122,6 +122,7 @@ class DepositCumArrearsReport(models.Model): "金额": amount, "应收金额": round((rec.original_amount or 0.0) - (rec.discount_amount or 0.0), 2), "所属公司": rec.company_id.name if rec.company_id else "", + "退款日期": rec.has_date.strftime("%Y-%m-%d") if rec.has_date else "", # 退款日期字段 "管理员": { 'model': 'res.users', 'id': rec.admin_id.id, diff --git a/yuthon_report/models/deposit_pre_received_report.py b/yuthon_report/models/deposit_pre_received_report.py index 30ed0ba45..e3f6eef0e 100644 --- a/yuthon_report/models/deposit_pre_received_report.py +++ b/yuthon_report/models/deposit_pre_received_report.py @@ -130,6 +130,7 @@ class DepositPreReceivedReport(models.Model): 'display_name': rec.lessee_id.name, } if rec.lessee_id else "", "收款日期": rec.payout_date.strftime("%Y-%m-%d") if rec.payout_date else "", + "退款日期": rec.has_date.strftime("%Y-%m-%d") if rec.has_date else "", # 退款日期字段 "金额": amount, "应收金额": round((rec.original_amount or 0.0) - (rec.discount_amount or 0.0), 2), "所属公司": rec.company_id.name if rec.company_id else "", diff --git a/yuthon_report/views/deposit_reports.xml b/yuthon_report/views/deposit_reports.xml index e1b553fe2..7132148a9 100644 --- a/yuthon_report/views/deposit_reports.xml +++ b/yuthon_report/views/deposit_reports.xml @@ -42,6 +42,7 @@ {"headerName": "物业名称", "field": "物业名称", "flex": 2.5}, {"headerName": "承租方名称", "field": "承租方名称", "flex": 1.4}, {"headerName": "收款日期", "field": "收款日期", "flex": 1.2}, + {"headerName": "退款日期", "field": "退款日期", "flex": 1.2}, {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, {"headerName": "应收金额", "field": "应收金额", "flex": 1, "type": "number"}, {"headerName": "所属公司", "field": "所属公司", "flex": 1}, @@ -95,6 +96,7 @@ {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, {"headerName": "应收金额", "field": "应收金额", "flex": 1, "type": "number"}, {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "退款日期", "field": "退款日期", "flex": 1.2}, {"headerName": "管理员", "field": "管理员", "flex": 1} ] }