From 62c25fb4aa83c5ab2feea4505c1915a9545f5f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Wed, 15 Jul 2026 10:39:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_stock/models/yuthon_fixed_asset_loan.py | 2 ++ .../report/fixed_asset_loan_report_templates.xml | 7 +++++++ yuthon_stock/views/yuthon_fixed_asset_loan_views.xml | 10 ++++++++++ 3 files changed, 19 insertions(+) diff --git a/yuthon_stock/models/yuthon_fixed_asset_loan.py b/yuthon_stock/models/yuthon_fixed_asset_loan.py index 4af0a5ca1..d5e09d5e0 100644 --- a/yuthon_stock/models/yuthon_fixed_asset_loan.py +++ b/yuthon_stock/models/yuthon_fixed_asset_loan.py @@ -45,6 +45,8 @@ class YuthonFixedAssetLoan(models.Model): ) active = fields.Boolean(default=True, string='有效') work_end = fields.Boolean(string="结束") + loan_date = fields.Date(string='借出时间') + return_date = fields.Date(string='归还时间') @api.depends('applicant_id') def _compute_department_id(self): diff --git a/yuthon_stock/report/fixed_asset_loan_report_templates.xml b/yuthon_stock/report/fixed_asset_loan_report_templates.xml index 01b9a11c8..790834163 100644 --- a/yuthon_stock/report/fixed_asset_loan_report_templates.xml +++ b/yuthon_stock/report/fixed_asset_loan_report_templates.xml @@ -47,6 +47,13 @@ 申请部门 + + + 借出时间 + + 归还时间 + + 借出资产 diff --git a/yuthon_stock/views/yuthon_fixed_asset_loan_views.xml b/yuthon_stock/views/yuthon_fixed_asset_loan_views.xml index cb337062c..d2dd8f030 100644 --- a/yuthon_stock/views/yuthon_fixed_asset_loan_views.xml +++ b/yuthon_stock/views/yuthon_fixed_asset_loan_views.xml @@ -28,6 +28,14 @@ + + + + + + + + @@ -45,6 +53,8 @@ + +