pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!12232 !12231 退款日期

Browse Source 
Merge pull request !12232 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-06-29 08:27:19 +00:00
committed by Gitee
parent 8004c2bac8 744009d41f
commit f2530ff42a
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_report/models/deposit_cum_arrears_report.py
+1
View File
@@ -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,
yuthon_report/models/deposit_pre_received_report.py
+1
View File
@@ -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 "",
yuthon_report/views/deposit_reports.xml
+2
View File
@@ -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}
]
}