From e68657338fcfd227147ca3f327bfc09170971639 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: Tue, 20 Jan 2026 16:41:53 +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 | 2 +- yuthon_issue/models/issue_boss_approval.py | 1 - yuthon_issue/models/issue_library.py | 7 ++----- yuthon_issue/views/issue_library_views.xml | 6 +++--- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/yuthon_issue/models/issue_approval_decision.py b/yuthon_issue/models/issue_approval_decision.py index fe423ce41..8e964d0a0 100644 --- a/yuthon_issue/models/issue_approval_decision.py +++ b/yuthon_issue/models/issue_approval_decision.py @@ -13,7 +13,7 @@ class IssueApprovalDecision(models.Model): specifics = fields.Text(string='具体事项') by_law = fields.Selection([('yes', '是'), ('no', '否')], string='是否经过法律审核') is_filing = fields.Selection([('yes', '备'), ('no', '否')], string='是否备案') - council_id = fields.Many2one('issue.library.type', string='党总委员会') + council_id = fields.Many2one('issue.library.type', string='党总支') team_meet_id = fields.Many2one('issue.library.type', string='经营班子会') board_meet_id = fields.Many2one('issue.library.type', string='董事会') district_state_id = fields.Many2one('issue.library.type', string="区国资局",) diff --git a/yuthon_issue/models/issue_boss_approval.py b/yuthon_issue/models/issue_boss_approval.py index c4e022173..3a9bcf7fc 100644 --- a/yuthon_issue/models/issue_boss_approval.py +++ b/yuthon_issue/models/issue_boss_approval.py @@ -33,7 +33,6 @@ class IssueBossApproval(models.Model): line.issue_id.is_state_updated = True line.issue_id.issue_state = 'will' - class IssueBossApprovalLine(models.Model): _name = 'issue.boss.approval.line' _description = '议题审批流程' diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index 8274bece5..0f50552fe 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -226,7 +226,7 @@ class IssueLibrary(models.Model): continue if record.issue_state in ['will', 'on_meet']: - if record.push_invisible: + if record.push_invisible : record.issue_state = 'on_meet' else: record.issue_state = 'will' @@ -285,9 +285,6 @@ class IssueLibrary(models.Model): def library_push(self): for rec in self: - if rec.is_state_updated: - continue - push_update_vals = {} if rec.is_party and (rec.is_party_passed == 'reject' or not rec.is_party_passed): push_update_vals['is_push_party'] = True @@ -616,7 +613,7 @@ class IssueLibraryLine(models.Model): issue_library_id = fields.Many2one('issue.library') issue_approval_decision_id = fields.Many2one('issue.approval.decision', string="上会依据") - council_id = fields.Many2one(related='issue_approval_decision_id.council_id', string='党总委员会') + council_id = fields.Many2one(related='issue_approval_decision_id.council_id', string='党总支') team_meet_id = fields.Many2one(related='issue_approval_decision_id.team_meet_id', string='经营班子会') board_meet_id = fields.Many2one(related='issue_approval_decision_id.board_meet_id', string='董事会') district_state_id = fields.Many2one(related='issue_approval_decision_id.district_state_id', string="区国资局") diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml index 64f28b0e8..69294dac0 100644 --- a/yuthon_issue/views/issue_library_views.xml +++ b/yuthon_issue/views/issue_library_views.xml @@ -69,7 +69,7 @@ -