!8570 !8569 添加功能

Merge pull request !8570 from 李鹏宇/dev

yuthon_issue/models/issue_library.py

@@ -20,7 +20,7 @@ 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_approval', '待审批'), ('approval', '审批中'), ('on_approval', '已审批'),
+    issue_state = fields.Selection([('draft', '待申报'), ('to_draft', '申报中'), ('to_approval', '待上会审批'), ('approval', '上会审批中'), ('on_approval', '已上会审批'),
                               ('will', '待上会'), ('on_meet', '已上会'), ('cancel', '已取消')],
                              default='draft', string="议题状态")
     is_party = fields.Boolean(string="党总支", store=True)
@@ -599,6 +599,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'
             return{
                 "type": "ir.actions.act_window",
                 "name": "审批详情",