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 @@ + +