添加功能

soong_workflow/wizard/soong_workflow_comment_wizard.py

@@ -651,10 +651,21 @@ class SoongWorkflowCommentWizard(models.TransientModel):
             for next_link in record_id.workflow_id.link_ids:
                 if next_link.name.split('-> ')[0].strip() == self.return_link_id.name.strip():
                     next_node_id = next_link.node_from
-            record_id.log_ids[-1].write({'approval_state': '2',
-                                         "lase_click_date": fields.Datetime.now(),
-                                         "comment": self.comment,
-                                         "node_btn_name": "1"})
+
+            user_log = record_id.log_ids.filtered(
+                lambda log: log.done_by == self.env.user and log.approval_state in ['0', '1'])
+            user_log.write({'approval_state': '2',
+                             "lase_click_date": fields.Datetime.now(),
+                             "comment": self.comment,
+                             "node_btn_name": "1"})
+            target_names = user_log.mapped('name')
+            logs_to_delete = record_id.log_ids.filtered(
+                lambda log: (log.name in target_names) and
+                            not log.comment and
+                            log not in user_log
+            )
+            if logs_to_delete:
+                logs_to_delete.unlink()
             self.sudo().env["soong.workflow.log"].create({
                 "code": self.code,
                 "model": self.res_model,

yuthon_holiday/models/extended_vacation_approval.py

@@ -14,7 +14,7 @@ class ExtendedVacationApproval(models.Model):
     users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
     department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
     employee_ids = fields.Many2many('hr.employee', string="假期顺延人员")
-    type_vacations_ids = fields.Many2many('hr.leave.type', string="假期类型")
+    type_vacations_ids = fields.Many2many('extended.type', string="假期类型")
     is_issues = fields.Boolean(string='是否上会')
     issues_result = fields.Html(string="会议结果")
     related_issues_id = fields.Many2one('issue.library', string="关联议题")
@@ -87,4 +87,11 @@ class ExtendedVacationLine(models.Model):
     vacation_id = fields.Many2one('extended.vacation.approval', string="假期延长")
     employee_id = fields.Many2one('hr.employee', string="姓名")
     dynamic_previous_year = fields.Float(string="上年年假剩余d", digits=(16, 3))
-    dynamic_previous_year1 = fields.Float(string="上年补休剩余d", digits=(16, 3))
+    dynamic_previous_year1 = fields.Float(string="上年补休剩余d", digits=(16, 3))
+
+
+class ExtendedType(models.Model):
+    _name = 'extended.type'
+    _description = "假期延长类型"
+
+    name = fields.Char(string="名称")

yuthon_holiday/security/ir.model.access.csv

@@ -8,4 +8,5 @@ access_leave_allocation_wizard,leave_allocation_wizard,model_leave_allocation_wi
 access_yuthon_leave_wizard,yuthon_leave_wizard,model_yuthon_leave_wizard,base.group_user,1,1,1,1
 access_yuthon_breastfeed_leave,yuthon_breastfeed_leave,model_yuthon_breastfeed_leave,base.group_user,1,1,1,1
 access_extended_vacation_approval,extended_vacation_approval,model_extended_vacation_approval,base.group_user,1,1,1,1
-access_extended_vacation_line,extended_vacation_line,model_extended_vacation_line,base.group_user,1,1,1,1
+access_extended_vacation_line,extended_vacation_line,model_extended_vacation_line,base.group_user,1,1,1,1
+access_extended_type,extended_type,model_extended_type,base.group_user,1,1,1,1

yuthon_holiday/views/extended_vacation_approval_views.xml

@@ -44,7 +44,7 @@
                      <group string="审批事项">
                         <group>
                             <field name="users_id"/>
-                            <field name="type_vacations_ids" widget="many2many_tags"/>
+                            <field name="type_vacations_ids" widget="many2many_tags" domain="[('name', 'in', ['年假', '补休']), ('model', '=', invisible_expression_model)]"/>
                             <field name="department_id" invisible="1"/>
                             <field name="date_postponed"/>
                             <field name="employee_ids" widget="many2many_tags"/>