diff --git a/soong_workflow/models/soong_workflow_node.py b/soong_workflow/models/soong_workflow_node.py index 2791addac..cd0cba7d9 100644 --- a/soong_workflow/models/soong_workflow_node.py +++ b/soong_workflow/models/soong_workflow_node.py @@ -88,7 +88,9 @@ class SoongWorkflowNode(models.Model): employee_ids = fields.Many2many('hr.employee', string='抄送/传阅人员') is_end = fields.Boolean(string="结束", default=False) department_id = fields.Many2many('hr.department', string='部门转入范围') - is_concatenation = fields.Boolean(string="是否串并", default=False, help='并:任何人均给意见,最后一个完成的人转交到下一节点.串:都会收到消息,但任意一个人转交后,即到下一节点,其他人将不再显示,相当于收回.') + approval_concatenation = fields.Selection([('chuan', '串申'), ('bing', '并申')], string="审批形式", default="bing", + help='并:任何人均给意见,最后一个完成的人转交到下一节点.' + '串:都会收到消息,但任意一个人转交后,即到下一节点,其他人将不再显示,相当于收回.') @api.onchange("is_apostille") def onchange_is_apostille(self): diff --git a/soong_workflow/views/soong_workflow_node_views.xml b/soong_workflow/views/soong_workflow_node_views.xml index 8a89ed3dc..bc105d24f 100644 --- a/soong_workflow/views/soong_workflow_node_views.xml +++ b/soong_workflow/views/soong_workflow_node_views.xml @@ -43,7 +43,7 @@ - +