diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py index 783fc3eaf..e46300a67 100644 --- a/yuthon_issue/models/inherit_room_booking.py +++ b/yuthon_issue/models/inherit_room_booking.py @@ -64,23 +64,21 @@ class RoomBooking(models.Model): if meet.issue_library_id: meeting_type_name = str(record.meeting_type_id.name).strip() if '党' in meeting_type_name: - if meet.issue_library_id.is_party and ( - meet.issue_library_id.is_party_passed == 'reject' or not meet.issue_library_id.is_party_passed): + if meet.issue_library_id.is_party and not meet.issue_library_id.is_party_passed: meet.issue_library_id.party_char = str( record.start_datetime.date()) + record.meeting_type_id.name meet.issue_library_id.issue_state_party = 'meeting' meet.issue_library_id.issue_state = False if '班子' in meeting_type_name: - if meet.issue_library_id.is_class and (meet.issue_library_id.is_class_passed == 'reject' or not meet.issue_library_id.is_class_passed): + if meet.issue_library_id.is_class and not meet.issue_library_id.is_class_passed: meet.issue_library_id.class_char = str( record.start_datetime.date()) + f'第{record.number_of_meetings}次' + record.meeting_type_id.name meet.issue_library_id.issue_state_class = 'meeting' meet.issue_library_id.issue_state = False if '董事' in meeting_type_name: - if meet.issue_library_id.is_boss and ( - meet.issue_library_id.is_boss_passed == 'reject' or not meet.issue_library_id.is_boss_passed): + if meet.issue_library_id.is_boss and not meet.issue_library_id.is_boss_passed: meet.issue_library_id.boss_char = str( record.start_datetime.date()) + record.meeting_type_id.name meet.issue_library_id.issue_state_boss = 'meeting' @@ -307,7 +305,7 @@ class IssueMeetingLine(models.Model): ) users_role_group_ids = fields.Many2many(comodel_name="soong.user.role.group", string="列席群组") is_sanda = fields.Boolean(string="三重一大") - decision_results = fields.Selection([('agree', '通过'), ('disagree', '重新上会'), ('rejected', '驳回')], string="决策结果") + decision_results = fields.Selection([('agree', '通过'), ('rejected', '驳回')], string="决策结果") decision_details = fields.Text(string="决策详情") def copy_line(self): @@ -374,7 +372,7 @@ class IssueMeetingLine(models.Model): for suffix in suffix_list: clean_party_char = clean_party_char.removesuffix(suffix) record.issue_library_id.party_char = clean_party_char + agree_name - record.issue_library_id.issue_state_party = 'on_meet' if is_push else 'will' + record.issue_library_id.issue_state_party = 'on_meet' # 3. 班子会相关 if '班子' in meeting_type_name: @@ -386,7 +384,7 @@ class IssueMeetingLine(models.Model): for suffix in suffix_list: clean_class_char = clean_class_char.removesuffix(suffix) record.issue_library_id.class_char = clean_class_char + agree_name - record.issue_library_id.issue_state_class = 'on_meet' if is_push else 'will' + record.issue_library_id.issue_state_class = 'on_meet' # 4. 董事会相关 if '董事' in meeting_type_name: @@ -397,7 +395,7 @@ class IssueMeetingLine(models.Model): for suffix in suffix_list: clean_boss_char = clean_boss_char.removesuffix(suffix) record.issue_library_id.boss_char = clean_boss_char + agree_name - record.issue_library_id.issue_state_boss = 'on_meet' if is_push else 'will' + record.issue_library_id.issue_state_boss = 'on_meet' # 套开相关 if '套' in meeting_type_name: diff --git a/yuthon_issue/models/issue_approval.py b/yuthon_issue/models/issue_approval.py index 9adedd906..e5aab350b 100644 --- a/yuthon_issue/models/issue_approval.py +++ b/yuthon_issue/models/issue_approval.py @@ -157,7 +157,8 @@ class IssueApproval(models.Model): for rec in self: if rec.issue_approval_ids: for issue_library in rec.issue_approval_ids: - issue_library.issue_library_id.write({'issue_state': 'to_approval'}) + issue_library.issue_library_id.write({'issue_state': 'to_approval', + }) if not issue_library.issue_library_id.issue_approval_id: issue_library.issue_library_id.issue_approval_id = rec.id if rec.code: diff --git a/yuthon_issue/views/issue_approval_views.xml b/yuthon_issue/views/issue_approval_views.xml index 7336fb401..0fa25d74d 100644 --- a/yuthon_issue/views/issue_approval_views.xml +++ b/yuthon_issue/views/issue_approval_views.xml @@ -76,7 +76,7 @@