From 520e1561edf14fcb67c1bfbf1024879e4151c320 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: Mon, 11 May 2026 15:15:36 +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 --- soong_workflow/models/soong_workflow_mixin.py | 16 +++++++++------- soong_workflow/models/soong_workflow_record.py | 1 - yuthon_issue/models/issue_library.py | 12 ++++-------- yuthon_issue/views/issue_library_views.xml | 4 ++++ 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index 33812f8ba..b9c53d07e 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -37,13 +37,8 @@ class SoongWorkflowMixin(models.AbstractModel): # setattr(record, field, value) # return res - def write(self, vals): - if self._context.get('_correction_skip'): - return super(SoongWorkflowMixin, self).write(vals) - for record in self: - if record.is_modify: - record._write({'is_modify': False}) - return super(SoongWorkflowMixin, self).write(vals) + def action_is_modify(self): + self.is_modify = False @api.model def _compute_default_state(self): @@ -1318,6 +1313,13 @@ class SoongWorkflowMixin(models.AbstractModel): done_el.set("invisible", "1") header_el.append(done_el) + modify_btn_el = etree.SubElement(header_el, "button") + modify_btn_el.set("name", "action_is_modify") + modify_btn_el.set("string", "已修正") + modify_btn_el.set("type", "object") + modify_btn_el.set("invisible", "not is_modify") + modify_btn_el.set("class", "btn btn-primary") + modify_el = etree.Element("field") modify_el.set("name", "is_modify") modify_el.set("invisible", "1") diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py index bd50606f8..4d2395d13 100644 --- a/soong_workflow/models/soong_workflow_record.py +++ b/soong_workflow/models/soong_workflow_record.py @@ -124,7 +124,6 @@ class SoongWorkflowRecord(models.Model): description=f"您有一条流水号为【{rec.code}】标题为【{rec.name}】流程待修正，请尽快修正", url=url, btntxt="详细信息") record = self.env[rec.res_model].sudo().browse(rec.res_id).exists() - record = record.with_context(_correction_skip=True) record.is_modify = True @api.returns('self', lambda value: value.id) diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index 7ed37f3b4..4d752cd24 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -151,14 +151,10 @@ class IssueLibrary(models.Model): 'target': 'current', } - def write(self, vals): - if self._context.get('_correction_skip'): - return super(IssueLibrary, self).write(vals) + def action_is_modify(self): for rec in self: - if rec.issue_state == 'to_modify': - vals['issue_state'] = rec.original_issue_state - vals['original_issue_state'] = False - return super(IssueLibrary, self).write(vals) + rec.issue_state = rec.original_issue_state + rec.original_issue_state = False def issue_party_approval(self): issue_active_ids = self.env["issue.library"].browse( @@ -326,7 +322,7 @@ class IssueLibrary(models.Model): title="议题修正", description="您有待修正的议题，请尽快修正", url=url, btntxt="详细信息") - rec.with_context(_correction_skip=True).write({ + rec.write({ 'original_issue_state': rec.issue_state, 'issue_state': 'to_modify', 'is_confirm': True, diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml index 93eab3984..b60e4f858 100644 --- a/yuthon_issue/views/issue_library_views.xml +++ b/yuthon_issue/views/issue_library_views.xml @@ -150,6 +150,10 @@
+
+