From 966e7191889b6a5a45906cf7384b32f3b0ede661 Mon Sep 17 00:00:00 2001 From: pengyuthon Date: Thu, 5 Feb 2026 10:34:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_issue/models/issue_library.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index dbdea47bb..d2b4bc3da 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -464,13 +464,13 @@ class IssueLibrary(models.Model): current_user = self.env.user user_company_name = current_user.company_id.name if current_user.company_id else "" for ras in issue_active_ids: - if ras.is_push_boss: + if ras.is_push_boss and not ras.class_boss: if ras.issue_state_boss != 'will': raise UserError('当前状态不允许上会') - elif ras.is_push_class: + elif ras.is_push_class and not ras.class_char: if ras.issue_state_class != 'will': raise UserError('当前状态不允许上会') - elif ras.is_push_party: + elif ras.is_push_party and not ras.class_party: if ras.issue_state_party != 'will': raise UserError('当前状态不允许上会') From c2e563911a49cd909cdd87094ff611da3a842c86 Mon Sep 17 00:00:00 2001 From: pengyuthon Date: Thu, 5 Feb 2026 10:37:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_issue/models/issue_library.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index d2b4bc3da..de774546c 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -464,13 +464,13 @@ class IssueLibrary(models.Model): current_user = self.env.user user_company_name = current_user.company_id.name if current_user.company_id else "" for ras in issue_active_ids: - if ras.is_push_boss and not ras.class_boss: + if ras.is_push_boss and not ras.boss_char: if ras.issue_state_boss != 'will': raise UserError('当前状态不允许上会') elif ras.is_push_class and not ras.class_char: if ras.issue_state_class != 'will': raise UserError('当前状态不允许上会') - elif ras.is_push_party and not ras.class_party: + elif ras.is_push_party and not ras.party_char: if ras.issue_state_party != 'will': raise UserError('当前状态不允许上会') From ad758679f08885b255e57b6c0624f41903cc291a Mon Sep 17 00:00:00 2001 From: pengyuthon Date: Thu, 5 Feb 2026 10:43:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AE=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_issue/models/issue_library.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index de774546c..23026d5c8 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -467,12 +467,18 @@ class IssueLibrary(models.Model): if ras.is_push_boss and not ras.boss_char: if ras.issue_state_boss != 'will': raise UserError('当前状态不允许上会') + else: + break elif ras.is_push_class and not ras.class_char: if ras.issue_state_class != 'will': raise UserError('当前状态不允许上会') + else: + break elif ras.is_push_party and not ras.party_char: if ras.issue_state_party != 'will': raise UserError('当前状态不允许上会') + else: + break issue_details = [] target_meeting_type_id = False From bbe99f76071a21db299401041d0ed9806b8d53ab 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, 5 Feb 2026 11:08:12 +0800 Subject: [PATCH 4/4] =?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 --- .../wizard/soong_workflow_comment_wizard.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 8787ac26d..3ad12a9af 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -28,6 +28,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): is_supervising = fields.Boolean(string="是否督办") comment_note_id = fields.Many2one('soong.note', string="常用意见") comment_note = fields.Text(string="意见") + illustrate = fields.Text(string="说明") comment = fields.Char(compute='_compute_comment', store=True) state_list = fields.Char(string="状态列表") record_id = fields.Integer() @@ -223,10 +224,16 @@ class SoongWorkflowCommentWizard(models.TransientModel): button = False if node.button_ids: for btn_name in button_priority_list: - target_btn = next((btn for btn in node.button_ids if btn.name == btn_name), None) - if target_btn: - button = target_btn - break + for btn in node.button_ids: + if btn.name == btn_name: + expression_result = False + if btn.is_review_invisible: + domain = eval(btn.invisible_expression) + expression_result = record_id.search(domain + [('id', '=', record_id.id)]) + if expression_result: + target_btn = btn + button = target_btn + break if not button: return self.env['hr.employee']