diff --git a/yuthon_issue/models/issue_approval_decision.py b/yuthon_issue/models/issue_approval_decision.py index 40e941104..fe423ce41 100644 --- a/yuthon_issue/models/issue_approval_decision.py +++ b/yuthon_issue/models/issue_approval_decision.py @@ -27,6 +27,7 @@ class IssueApprovalDecision(models.Model): end_date = fields.Date(string="失效日期") remarks = fields.Text(string='备注') issue_approval_id = fields.Many2one('issue.approval', string="关联议题审批") + version = fields.Char(string="版本", default="V3.0") def _get_default_company(self): company = self.env['res.company'].search([('name', '=', '集团本部')], limit=1) diff --git a/yuthon_issue/views/issue_approval_decision_views.xml b/yuthon_issue/views/issue_approval_decision_views.xml index 11f01459e..8bc051342 100644 --- a/yuthon_issue/views/issue_approval_decision_views.xml +++ b/yuthon_issue/views/issue_approval_decision_views.xml @@ -20,6 +20,7 @@ + @@ -47,14 +48,14 @@ - - - + + + @@ -62,6 +63,7 @@ + diff --git a/yuthon_maintain/models/property_device_repair.py b/yuthon_maintain/models/property_device_repair.py index 951e84e2e..9078e2f8a 100644 --- a/yuthon_maintain/models/property_device_repair.py +++ b/yuthon_maintain/models/property_device_repair.py @@ -18,7 +18,6 @@ class PropertyDeviceRelief(models.Model): company_id = fields.Many2one(related='users_id.employee_id.company_id', string="公司") software_processing_id = fields.Many2one('software.issues.processing', string="设备类型") problem_description = fields.Text(string="问题描述") - remake = fields.Text(string="问题描述") report_state = fields.Selection([('to', '待处理'), ('done', '已处理')], string='状态', default='to') create_time = fields.Date(string="填报日期", default=fields.Datetime.now) urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', @@ -38,7 +37,7 @@ class PropertyDeviceRelief(models.Model): def _compute_name(self): for rec in self: if rec.users_id and rec.software_processing_id: - rec.name = f" {rec.software_processing_id.name}-{rec.users_id.name}-{rec.remake}" + rec.name = f"{rec.users_id.name}-{rec.software_processing_id.name}-{rec.problem_description}" def get_no_read_count(self):