From 7257575c1c68155094ba6127a4401bdd0dfc4369 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: Mon, 19 Jan 2026 10:50:07 +0800 Subject: [PATCH 1/4] =?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 --- .../templates/soong_workflow_templates.xml | 95 ++++++++++++++++++- 1 file changed, 91 insertions(+), 4 deletions(-) diff --git a/soong_workflow/templates/soong_workflow_templates.xml b/soong_workflow/templates/soong_workflow_templates.xml index 70ab7f10e..2068be19a 100644 --- a/soong_workflow/templates/soong_workflow_templates.xml +++ b/soong_workflow/templates/soong_workflow_templates.xml @@ -3,7 +3,7 @@ + soong.workflow.log.kanban + soong.workflow.log + + + + + + + + + + +
+
+
+ + 节点： + +
+
+ + 状态： + +
+
+ + 经办人： + +
+
+ + 意见： + +
+
+ + 附件： + +
+
+
+ + + + + + soong.workflow.log.kanban soong.workflow.log @@ -162,8 +209,8 @@ - - soong.workflow.log2.kanban + + soong.workflow.log2.manager.kanban soong.workflow.log2 @@ -202,4 +249,44 @@ + + soong.workflow.log2.kanban + soong.workflow.log2 + + + + + + + + +
+
+
+ + 姓名： + +
+
+ + 意见： + +
+
+ + 状态： + +
+
+ + 时间： + +
+
+
+ + + + + From 2adf1f9f2b1a127cc6bedf7a3baacda3e36291fc 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: Mon, 19 Jan 2026 10:52:47 +0800 Subject: [PATCH 2/4] =?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/templates/soong_workflow_templates.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soong_workflow/templates/soong_workflow_templates.xml b/soong_workflow/templates/soong_workflow_templates.xml index 2068be19a..bb46f1887 100644 --- a/soong_workflow/templates/soong_workflow_templates.xml +++ b/soong_workflow/templates/soong_workflow_templates.xml @@ -163,7 +163,7 @@ - soong.workflow.log.kanban + soong.workflow.log.manager.kanban soong.workflow.log From cf6ef1952a3f28548e102edb633e63aad597a98d Mon Sep 17 00:00:00 2001 From: pengyuthon Date: Mon, 19 Jan 2026 11:11:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AF=B7=E5=81=87=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_holiday/views/hr_leave_batch.xml | 428 +++++++++++++----------- 1 file changed, 224 insertions(+), 204 deletions(-) diff --git a/yuthon_holiday/views/hr_leave_batch.xml b/yuthon_holiday/views/hr_leave_batch.xml index a109f55ab..ccb5e5946 100644 --- a/yuthon_holiday/views/hr_leave_batch.xml +++ b/yuthon_holiday/views/hr_leave_batch.xml @@ -24,10 +24,10 @@ type="object" class="btn-primary" invisible="not work_end" - /> + /> - @@ -54,46 +54,48 @@ - + - + - - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + context="{'employee_id': employee_id}" + options="{'no_create': True, 'no_open': True, 'request_type': 'leave'}" + readonly="state in ['cancel', 'refuse', 'validate', 'validate1']" + width="100px" + /> + + + + + +
+ + - - - -
- - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - + context="{'employee_id': employee_id}" + options="{'no_create': True, 'no_open': True, 'request_type': 'leave'}" + readonly="state in ['cancel', 'refuse', 'validate', 'validate1']" + width="100px" + /> + + + + + + + + +
+ + @@ -277,97 +287,107 @@ - yuthon.holiday.day.kanban - hr.leave - - - - - - - - - -
-
-
- - 类型： - -
-
- - 开始时间： - -
-
- - 结束时间： - -
-
- - 天数： - -
-
- - 附件： - + yuthon.holiday.day.kanban + hr.leave + + + + + + + + + +
+
+
+ + 类型： + + +
+
+ + 开始时间： + + +
+
+ + 结束时间： + + +
+
+ + 天数： + + +
+
+ + 附件： + + +
-
- - - - - - - yuthon.holiday.hour.kanban - hr.leave - - - - - - - - - -
-
-
- - 类型： - -
-
- - 日期： - -
-
- - 开始时间： - -
-
- - 结束时间： - -
-
- - 小时： - + + + + + + + yuthon.holiday.hour.kanban + hr.leave + + + + + + + + + +
+
+
+ + 类型： + + +
+
+ + 日期： + + +
+
+ + 开始时间： + + +
+
+ + 结束时间： + + +
+
+ + 小时： + + +
-
- - - - - + + + + + From 643ce8a709f2ebb6964e5edbf2ce0c75044200e5 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: Mon, 19 Jan 2026 11:13:18 +0800 Subject: [PATCH 4/4] =?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 --- .../wizard/soong_workflow_record_delete_wizard.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_record_delete_wizard.py b/soong_workflow/wizard/soong_workflow_record_delete_wizard.py index 581635300..4d9b8e428 100644 --- a/soong_workflow/wizard/soong_workflow_record_delete_wizard.py +++ b/soong_workflow/wizard/soong_workflow_record_delete_wizard.py @@ -89,9 +89,9 @@ class SoongWorkflowRecordDeleteWizard(models.TransientModel): "state": "confirm", "active": False }) - # 确保在写入前记录仍然存在 - if target_record.exists(): - target_record.write({'active': False}) + # # # 确保在写入前记录仍然存在 + # if target_record.exists(): + # target_record.write({'is_active': False}) else: workflow_record = self.env["soong.workflow.record"].sudo().search( [("id", "=", record.id), ('reclaim_state', "=", True)], limit=1)