添加功能

soong_workflow/models/soong_workflow_node.py

@@ -102,6 +102,11 @@ class SoongWorkflowNode(models.Model):
     approval_concatenation = fields.Selection([('chuan', '串申'), ('bing', '并申')], string="审批形式", default="bing",
                                         help='并：任何人均给意见，最后一个完成的人转交到下一节点.'
                                              '串：都会收到消息，但任意一个人转交后，即到下一节点，其他人将不再显示，相当于收回.')
+    same_user_skip_type = fields.Selection([
+        ('none', '不跳过'),
+        ('next', '跳过下一个相同人员节点'),
+        ('prev', '跳过上一个相同人员节点'),
+    ], string='相同人员节点处理', default='none')
 
     @api.onchange("is_apostille")
     def onchange_is_apostille(self):

soong_workflow/views/soong_workflow_node_views.xml

@@ -17,6 +17,7 @@
                             <field name="return_comment_id"/>
                             <field name="confirm_comment_id"/>
                             <field name="end_comment_id"/>
+                            <field name="same_user_skip_type"/>
                             <field name="illustrate"/>
                         </group>
                         <group>

soong_workflow/wizard/soong_workflow_comment_wizard.py

@@ -39,9 +39,9 @@ class SoongWorkflowCommentWizard(models.TransientModel):
     return_link_id = fields.Many2one('trans.link', string='退回节点', ondelete='set null')
     invalid_link_ids = fields.Many2many(
         'trans.link',
-        string='审批人节点,跳过节点',
+        string='跳过相同人员',
         compute='_compute_invalid_link_ids',
-        help='没有找到符合条件审批人的节点'
+        help='跳过相同人员的节点'
     )
 
     employee_trans_domain_ids = fields.Many2many('hr.employee', 'employee_trans_domain_ids_rel', string="传阅人员", store=True)
@@ -173,19 +173,33 @@ class SoongWorkflowCommentWizard(models.TransientModel):
             if current_link and all_links:
                 sorted_all_links = all_links.sorted('sequence')
                 for idx, link in enumerate(sorted_all_links):
-                    if link.id == current_link.id and link.sequence == current_link.sequence:
-                        approvers = self._get_approvers_for_link(link, record_id)
-                        log_records = record_id.log_ids
-                        approved_users = log_records.filtered(lambda log: log.node_btn_name != '1' and log.done_by).mapped('done_by.employee_ids')
-                        approved_employee_ids = approved_users.ids
-                        employee_ids = approvers.ids
-                        if len(approvers) > 1:
-                            is_all_included = all(emp_id in approved_employee_ids for emp_id in employee_ids)
-                            if is_all_included:
-                                if idx + 1 < len(sorted_all_links):
-                                    self.trans_link_id = sorted_all_links[idx + 1]
-                                    invalid_links |= current_link
-                                break
+                    approvers = self._get_approvers_for_link(link, record_id)
+                    # 如果当前审批人是 1 个人，才判断跳过
+                    if len(approvers) == 1:
+                        current_approver = approvers[0]
+                        # 跳过规则 next：跳过【下一个】节点
+                        node_id = record_id.workflow_id.node_ids.search([
+                            ('name', '=', link.name),
+                            ('workflow_id', '=', record_id.workflow_id.id)
+                        ])
+                        if node_id.same_user_skip_type == 'next':
+                            # 有下一个节点
+                            if idx + 1 < len(sorted_all_links):
+                                next_link = sorted_all_links[idx + 1]
+                                next_approvers = self._get_approvers_for_link(next_link, record_id)
+                                # 下一个节点也是 1 个人，且和当前是同一个
+                                if len(next_approvers) == 1 and next_approvers[0] == current_approver:
+                                    invalid_links |= next_link  # 下一个节点无效（跳过）
+
+                        # 跳过规则 prev：跳过【上一个】节点
+                        if node_id.same_user_skip_type == 'prev':
+                            # 有上一个节点
+                            if idx - 1 >= 0:
+                                prev_link = sorted_all_links[idx - 1]
+                                prev_approvers = self._get_approvers_for_link(prev_link, record_id)
+                                # 上一个节点也是 1 个人，且和当前是同一个
+                                if len(prev_approvers) == 1 and prev_approvers[0] == current_approver:
+                                    invalid_links |= prev_link
 
             record.invalid_link_ids = invalid_links
 

yuthon_hr_attendance/views/overtime_approval.xml

@@ -113,7 +113,7 @@
                     <group col="2">
                         <group>
                             <field name="is_thwg" invisible="1"/>
-                            <field name="overtime_hours" readonly="1" invisible="overtime_hours1 or overtime_hours"/>
+                            <field name="overtime_hours" readonly="1" invisible="overtime_hours1 or overtime_hours == 0.0"/>
                             <field name="overtime_hours1" invisible="not overtime_hours1" readonly="1"/>
                             <field name="meal" required="1" invisible="is_thwg or is_lc"/>
                         </group>