diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index ca33394b6..fd1eedd7f 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -141,18 +141,11 @@ class IssueLibrary(models.Model): records = self.env['issue.library'].browse(active_ids) count = 0 for record in records: - if record.class_char: - # 先清理HTML标签 - value = record.class_char - value = re.sub(r'<[^>]+>', '', value) - # 再补"次"字 - if '班子会' in value and '第' in value: - pattern = r'(第\d+)(班子会)' - new_value = re.sub(pattern, r'\1次\2', value) - else: - new_value = value - if new_value != record.class_char: - record.class_char = new_value + # 只清理party_char的HTML标签 + if record.party_char: + clean_value = re.sub(r'<[^>]+>', '', record.party_char) + if clean_value != record.party_char: + record.party_char = clean_value count += 1 return { 'type': 'ir.actions.client', diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml index 9ef07c3a6..def33a6d7 100644 --- a/yuthon_issue/views/issue_library_views.xml +++ b/yuthon_issue/views/issue_library_views.xml @@ -57,6 +57,7 @@ decoration-muted="issue_state == 'cancel'">
diff --git a/yuthon_property_approval/models/property_open_rent.py b/yuthon_property_approval/models/property_open_rent.py index 0b1e94e9c..e3f2ddb04 100644 --- a/yuthon_property_approval/models/property_open_rent.py +++ b/yuthon_property_approval/models/property_open_rent.py @@ -22,6 +22,7 @@ class PropertyOpenRent(models.Model): document_ids = fields.Many2many('ir.attachment', string="附件") handling_opinions = fields.Text(string="经办意见") type_stamp_ids = fields.Many2many('seals.type.setting', string='用章类型') + is_chapter = fields.Selection([('yes', '是'), ('no', '否')], string='是否用章', default='no') # 物业 property_name = fields.Char(string="物业信息") diff --git a/yuthon_property_approval/views/property_open_rent_views.xml b/yuthon_property_approval/views/property_open_rent_views.xml index affc194b4..aaa579e81 100644 --- a/yuthon_property_approval/views/property_open_rent_views.xml +++ b/yuthon_property_approval/views/property_open_rent_views.xml @@ -41,7 +41,8 @@ - + +