diff --git a/soong_workflow/models/soong_workflow.py b/soong_workflow/models/soong_workflow.py index 1cfd43a58..8bb5c7359 100644 --- a/soong_workflow/models/soong_workflow.py +++ b/soong_workflow/models/soong_workflow.py @@ -46,6 +46,7 @@ class SoongWorkflow(models.Model): remove_default_btn_until_end = fields.Boolean(string="覆盖表头按钮", default=False) current_stage_highlight_color = fields.Char(string="当前阶段颜色", default="rgb(0, 255, 255)", help="The color to highlight the current stage on flow", ) start_date = fields.Date(string="生效日期", copy=False, default=fields.Date.today()) + text = fields.Text(string="描述") end_date = fields.Date(string="失效日期", copy=False, default=fields.Date.from_string('2099-01-01')) is_enable = fields.Boolean(string="是否启用", compute="compute_is_enable", store=True) is_enable_return_button = fields.Boolean(string="是否启用收回", default=True) diff --git a/soong_workflow/views/kklw_workflow_approval_views.xml b/soong_workflow/views/kklw_workflow_approval_views.xml index 21f66eeae..180a4d4ad 100644 --- a/soong_workflow/views/kklw_workflow_approval_views.xml +++ b/soong_workflow/views/kklw_workflow_approval_views.xml @@ -7,19 +7,24 @@ + - +
-
-

- -

-

-
- -

-
- +
+
+

+ +

+

+
+

+
+ +
+
+
+
diff --git a/soong_workflow/views/soong_workflow_views.xml b/soong_workflow/views/soong_workflow_views.xml index 3442d008a..41f627b36 100644 --- a/soong_workflow/views/soong_workflow_views.xml +++ b/soong_workflow/views/soong_workflow_views.xml @@ -25,6 +25,7 @@ + @@ -60,6 +61,7 @@ + diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py index d9e53945d..2f8498753 100644 --- a/yuthon_hr_employee/models/yuthon_hr_employee.py +++ b/yuthon_hr_employee/models/yuthon_hr_employee.py @@ -502,6 +502,15 @@ class YuthonHrEmployee(models.Model): } return action + def put_batch_return(self): + uid = self.user_id.id + action = { + 'type': 'ir.actions.act_window', + 'res_model': 'hr.leave.batch', + 'view_mode': 'tree', + 'domain': [('users_id', '=', uid)], + } + return action def put_holiday_return(self): employee_id = self.user_id.employee_id.id diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml index 2968d107b..3ce8fcbe7 100644 --- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml +++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml @@ -192,11 +192,16 @@ - - - - - + + + + + + + + +