From 3f51aba487a3868bc7b72aa4ea5842e136f98671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 25 Dec 2025 15:47:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_issue/models/issue_approval_decision.py       | 1 +
 yuthon_issue/views/issue_approval_decision_views.xml | 8 +++++---
 yuthon_maintain/models/property_device_repair.py     | 3 +--
 3 files changed, 7 insertions(+), 5 deletions(-)

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 @@
                 <field name="is_filing"/>
                 <field name="remarks"/>
                 <field name="scope"/>
+                <field name="version"/>
                 <field name="company_id" optional="hide"/>
                 <field name="start_date" optional="hide"/>
                 <field name="end_date" optional="hide"/>
@@ -47,14 +48,14 @@
                         </group>
                         <group>
                             <field name="specifics" required="1"/>
-                            <field name="by_law"/>
-                            <field name="is_filing"/>
                             <field name="team_meet_id"/>
                         </group>
                         <group>
                             <field name="board_meet_id"/>
                             <field name="start_date"/>
-                            <field name="department_id" widget="ztree_select"/>
+                            <field name="department_id"/>
+                            <field name="by_law"/>
+                            <field name="is_filing"/>
                         </group>
                         <group>
                             <field name="district_state_id"/>
@@ -62,6 +63,7 @@
                             <field name="district_party_id"/>
                             <field name="scope"/>
                             <field name="company_id"/>
+                            <field name="version"/>
                             <field name="end_date"/>
                         </group>
                     </group>
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):