From 180aee4e97343490283fc553519ba762ccb0dfaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
<9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 14 Jan 2026 21:09:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
soong_workflow/views/soong_workflow_views.xml | 2 +-
soong_workflow/wizard/soong_workflow_comment_wizard.py | 2 +-
yuthon_holiday/models/inherit_hr_leave.py | 9 +++++++--
.../views/yuthon_renewal_approval_views.xml | 10 +++++-----
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/soong_workflow/views/soong_workflow_views.xml b/soong_workflow/views/soong_workflow_views.xml
index daef6f356..9411c2e30 100644
--- a/soong_workflow/views/soong_workflow_views.xml
+++ b/soong_workflow/views/soong_workflow_views.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 09d2ed386..f2ea71b03 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -700,7 +700,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa',
user_id=employee.wecom_userid,
title=record_id._description,
- description=f"编号为{record_id.code}的{record_id._description}已结束,请归档",
+ description=f"标题为{record_id.name}的{record_id._description}已结束,请归档",
url=url, btntxt="查看详情")
self.node_btn_id.with_context(cx).run()
if self.node_btn_name == "分发":
diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py
index 8dfc006c9..249d04a9d 100644
--- a/yuthon_holiday/models/inherit_hr_leave.py
+++ b/yuthon_holiday/models/inherit_hr_leave.py
@@ -399,8 +399,13 @@ class HolidaysRequestBatch(models.Model):
}
self.env['soong.workflow.entrust'].create(entrust_vals)
- self.leave_ids.action_validate()
- self.hour_leave_ids.action_validate()
+ if self.leave_ids:
+ for record in self.leave_ids:
+ record.write({'state': 'validate'})
+ if self.hour_leave_ids:
+ for record in self.hour_leave_ids:
+ record.write({'state': 'validate'})
+
"""提交请假申请,区分年假和其他假期处理"""
self._process_specific_leaves('年假', is_annual_leave=True)
other_leave_types = [
diff --git a/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml
index 177d57f5a..031de1683 100644
--- a/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml
@@ -49,7 +49,7 @@
-
+
@@ -60,9 +60,9 @@
-
+
-
+
@@ -75,8 +75,8 @@
-
-
+
+