diff --git a/soong_workflow/models/soong_approval_group.py b/soong_workflow/models/soong_approval_group.py index 0f8e78d82..c6ee05eab 100644 --- a/soong_workflow/models/soong_approval_group.py +++ b/soong_workflow/models/soong_approval_group.py @@ -6,5 +6,5 @@ class SoongApprovalGroup(models.Model): _name = 'soong.approval.group' _order = 'sequence' - name = fields.Char(string="分组名称") + name = fields.Char(string="分组") sequence = fields.Integer(default=1) diff --git a/yuthon_hr_attendance/models/yuthon_shift_approval.py b/yuthon_hr_attendance/models/yuthon_shift_approval.py index 12b2920bc..56803c52a 100644 --- a/yuthon_hr_attendance/models/yuthon_shift_approval.py +++ b/yuthon_hr_attendance/models/yuthon_shift_approval.py @@ -19,7 +19,7 @@ class YuthonShiftApproval(models.Model): shift_id = fields.Many2one('planning.slot', string="申请人班次1") shift_two_id = fields.Many2one('planning.slot', string="申请人班次2") return_id = fields.Many2one('planning.slot', string="调班人班次1") - return_two_id = fields.Many2one('planning.slot', string="申请人班次2") + return_two_id = fields.Many2one('planning.slot', string="调班人班次2") department_id = fields.Many2one('hr.department', string="部门", related='resource_id.employee_id.department_id') resource_ids = fields.Many2many('resource.resource', string="资源用户列表") is_issues = fields.Boolean(string='是否上会') diff --git a/yuthon_hr_attendance/views/resource_calendar_leaves_views.xml b/yuthon_hr_attendance/views/resource_calendar_leaves_views.xml index 2e109c35b..c713846f6 100644 --- a/yuthon_hr_attendance/views/resource_calendar_leaves_views.xml +++ b/yuthon_hr_attendance/views/resource_calendar_leaves_views.xml @@ -66,14 +66,14 @@ - - resource.calendar.leaves.tree - resource.calendar.leaves - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/yuthon_hr_employee/controllers/employee_banner_route.py b/yuthon_hr_employee/controllers/employee_banner_route.py index 1432770db..436ea9061 100644 --- a/yuthon_hr_employee/controllers/employee_banner_route.py +++ b/yuthon_hr_employee/controllers/employee_banner_route.py @@ -10,20 +10,20 @@ class EmployeeBannerRoute(Controller): in_hired_count = employees.search_count([]) # 在职 all_hired_count = employees.search_count([]) # 全职 return { - 'html': f""" -
-
-

正式

-

{hired_count}

-
-
-

在职

-

{in_hired_count}

-
-
-

全职

-

{all_hired_count}

-
-
- """ + # 'html': f""" + #
+ #
+ #

正式

+ #

{hired_count}

+ #
+ #
+ #

在职

+ #

{in_hired_count}

+ #
+ #
+ #

全职

+ #

{all_hired_count}

+ #
+ #
+ # """ } diff --git a/yuthon_work_brand/static/description/salary.png b/yuthon_work_brand/static/description/salary.png new file mode 100644 index 000000000..27b332093 Binary files /dev/null and b/yuthon_work_brand/static/description/salary.png differ diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index c18750d95..e1506134b 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -314,9 +314,9 @@ + sequence="9"/> - + @@ -394,15 +394,15 @@ parent="human_pay_setting_structural_lc_board" action="yuthon_salary.view_yuthon_payroll_lc_common_action" sequence="5"/> - + @@ -433,15 +433,15 @@ parent="human_pay_setting_structural_wg_board" action="yuthon_salary.view_yuthon_payroll_wg_common_action" sequence="7"/> - +