diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml index 366265392..db6d33978 100644 --- a/soong_workflow/views/soong_workflow_record.xml +++ b/soong_workflow/views/soong_workflow_record.xml @@ -355,7 +355,7 @@ - + diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index 3fe82bbf1..523a76537 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -20,17 +20,9 @@ class IssueLibrary(models.Model): is_invisible_workflow = fields.Boolean(string="流程隐藏的判断") code = fields.Char(string='编号', required=True, copy=False, default=lambda self: self.env['ir.sequence'].next_by_code('issue_library_code')) - issue_state = fields.Selection([('draft', '待申报'), ('to_draft', '申报中'), - ('to_approval', '待上会审批'), ('approval', '上会审批中'), - ('on_approval', '已上会审批'), ('cancel', '已取消')], + issue_state = fields.Selection([('draft', '待申报'), ('to_draft', '申报中'), ('to_approval', '待上会审批'), ('approval', '上会审批中'), ('on_approval', '已上会审批'), + ('will', '待上会'), ('meeting', '上会中'), ('on_meet', '已上会'), ('cancel', '已取消')], default='draft', string="议题状态") - issue_state_party = fields.Selection([('will', '待上会'), ('meeting', '上会中'), ('on_meet', '已上会')], - default='will', string="议题状态") - issue_state_class = fields.Selection([('will', '待上会'), ('meeting', '上会中'), ('on_meet', '已上会')], - default='will', string="议题状态") - issue_state_boss = fields.Selection([('will', '待上会'), ('meeting', '上会中'), ('on_meet', '已上会')], - default='will', string="议题状态") - is_party = fields.Boolean(string="党总支", store=True) party_char = fields.Char(string=' ') is_class = fields.Boolean(string="班子会", store=True) @@ -543,6 +535,8 @@ class IssueLibrary(models.Model): def single_meeting_issue(self): issue = self.env["issue.library"].browse(self.id) + if issue.issue_state != 'will': + raise UserError("当前状态不允许上会") current_user = self.env.user user_company_name = current_user.company_id.name if current_user.company_id else "" issue_details = [] @@ -552,12 +546,14 @@ class IssueLibrary(models.Model): ('is_class', 'is_class_passed', '班子'), # 班子会：匹配含「班子」的名称 ('is_boss', 'is_boss_passed', '董事'), # 董事会：匹配含「董事」的名称 ] + def get_all_sub_departments(department): dept_ids = [department.id] sub_depts = self.env['hr.department'].search([('parent_id', '=', department.id)]) for sub_dept in sub_depts: dept_ids += get_all_sub_departments(sub_dept) return dept_ids + all_dept_ids = get_all_sub_departments(self.department_id) target_employees = self.env['hr.employee'].search([ ('department_id', 'in', all_dept_ids), @@ -601,6 +597,7 @@ class IssueLibrary(models.Model): break elif passed_result == 'pass': continue + form_id = self.env.ref("room.room_booking_view_form").id return { "type": "ir.actions.act_window", @@ -622,7 +619,7 @@ class IssueLibrary(models.Model): if not record.issue_approval_id: raise UserError('请提交审批后查看') form_id = self.env.ref("yuthon_issue.issue_library_approval_form").id - # record.issue_state = 'to_draft' + record.issue_state = 'to_draft' return{ "type": "ir.actions.act_window", "name": "审批详情", diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml index 05177f2df..55111d621 100644 --- a/yuthon_issue/views/issue_library_views.xml +++ b/yuthon_issue/views/issue_library_views.xml @@ -11,9 +11,8 @@ - - + + @@ -28,16 +27,11 @@ -