diff --git a/soong_workflow/views/kklw_workflow_approval_views.xml b/soong_workflow/views/kklw_workflow_approval_views.xml index 25c1820a1..fda1f4995 100644 --- a/soong_workflow/views/kklw_workflow_approval_views.xml +++ b/soong_workflow/views/kklw_workflow_approval_views.xml @@ -12,22 +12,19 @@
-
-
+
+


-
- - +
+ +
-
- -
diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py index e46300a67..98d0448dd 100644 --- a/yuthon_issue/models/inherit_room_booking.py +++ b/yuthon_issue/models/inherit_room_booking.py @@ -65,34 +65,34 @@ class RoomBooking(models.Model): meeting_type_name = str(record.meeting_type_id.name).strip() if '党' in meeting_type_name: 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 + party_value = str(record.start_datetime.date()) + record.meeting_type_id.name + meet.issue_library_id.party_char = f'{party_value}' 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 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 + class_value = str(record.start_datetime.date()) + f'第{record.number_of_meetings}次' + record.meeting_type_id.name + meet.issue_library_id.class_char = f'{class_value}' 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 not meet.issue_library_id.is_boss_passed: - meet.issue_library_id.boss_char = str( - record.start_datetime.date()) + record.meeting_type_id.name + boss_value = str(record.start_datetime.date()) + record.meeting_type_id.name + meet.issue_library_id.boss_char = f'{boss_value}' meet.issue_library_id.issue_state_boss = 'meeting' meet.issue_library_id.issue_state = False elif '套' 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): - meet.issue_library_id.party_char = str( - record.start_datetime.date()) + record.meeting_type_id.name + party_value = str(record.start_datetime.date()) + record.meeting_type_id.name + meet.issue_library_id.party_char = f'{party_value}' meet.issue_library_id.issue_state_party = 'meeting' meet.issue_library_id.issue_state = False elif meet.issue_library_id.is_class and (meet.issue_library_id.is_class_passed == 'r eject' or 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 + class_value = str(record.start_datetime.date()) + f'第{record.number_of_meetings}次' + record.meeting_type_id.name + meet.issue_library_id.class_char = f'{class_value}' meet.issue_library_id.issue_state_class = 'meeting' meet.issue_library_id.issue_state = False @@ -371,7 +371,8 @@ class IssueMeetingLine(models.Model): clean_party_char = original_party_char for suffix in suffix_list: clean_party_char = clean_party_char.removesuffix(suffix) - record.issue_library_id.party_char = clean_party_char + agree_name + clean_party_char = clean_party_char.replace('', '').replace('', '') + record.issue_library_id.party_char = f'{clean_party_char + agree_name}' record.issue_library_id.issue_state_party = 'on_meet' # 3. 班子会相关 @@ -383,7 +384,8 @@ class IssueMeetingLine(models.Model): clean_class_char = original_class_char for suffix in suffix_list: clean_class_char = clean_class_char.removesuffix(suffix) - record.issue_library_id.class_char = clean_class_char + agree_name + clean_class_char = clean_class_char.replace('', '').replace('', '') + record.issue_library_id.class_char = f'{clean_class_char + agree_name}' record.issue_library_id.issue_state_class = 'on_meet' # 4. 董事会相关 @@ -394,7 +396,8 @@ class IssueMeetingLine(models.Model): clean_boss_char = original_boss_char for suffix in suffix_list: clean_boss_char = clean_boss_char.removesuffix(suffix) - record.issue_library_id.boss_char = clean_boss_char + agree_name + clean_boss_char = clean_boss_char.replace('', '').replace('', '') + record.issue_library_id.boss_char = f'{clean_boss_char + agree_name}' record.issue_library_id.issue_state_boss = 'on_meet' # 套开相关 @@ -410,7 +413,8 @@ class IssueMeetingLine(models.Model): clean_party_char = original_party_char for suffix in suffix_list: clean_party_char = clean_party_char.removesuffix(suffix) - record.issue_library_id.party_char = clean_party_char + agree_name + clean_party_char = clean_party_char.replace('', '').replace('', '') + record.issue_library_id.party_char = f'{clean_party_char + agree_name}' record.issue_library_id.issue_state_party = 'on_meet' if is_push else 'will' elif (record.issue_library_id.is_class and @@ -422,7 +426,8 @@ class IssueMeetingLine(models.Model): clean_class_char = original_class_char for suffix in suffix_list: clean_class_char = clean_class_char.removesuffix(suffix) - record.issue_library_id.class_char = clean_class_char + agree_name + clean_class_char = clean_class_char.replace('', '').replace('', '') + record.issue_library_id.class_char = f'{clean_class_char + agree_name}' record.issue_library_id.issue_state_class = 'on_meet' if is_push else 'will' def unlink(self): diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index 1b564c2d2..da0863dc0 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -55,11 +55,11 @@ class IssueLibrary(models.Model): default='will', string="会议状态") is_party = fields.Boolean(string="党总支", store=True) - party_char = fields.Char(string=' ') + party_char = fields.Html(string=' ') is_class = fields.Boolean(string="班子会", store=True) - class_char = fields.Char(string=' ') + class_char = fields.Html(string=' ') is_boss = fields.Boolean(string="董事会", store=True) - boss_char = fields.Char(string=' ') + boss_char = fields.Html(string=' ') is_note = fields.Boolean(string="上级单位",store=True) is_district_state = fields.Boolean(string="区国资局", store=True) is_district_government = fields.Boolean(string="区政府", store=True)