From cfa7edad05129f33f660d2cc27193e63bb4aa638 Mon Sep 17 00:00:00 2001 From: zhouzhou <123@qq.com> Date: Tue, 5 Nov 2024 19:36:29 +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/models/soong_workflow_node.py | 2 +- yuthon_holiday/__init__.py | 3 +- yuthon_holiday/models/inherit_hr_leave.py | 34 ++++-- yuthon_holiday/views/假期前端修改.xml | 5 + yuthon_holiday/wizard/__init__.py | 0 .../wizard/holiday_detail_wizard.py | 2 + yuthon_hr_attendance/__manifest__.py | 1 + yuthon_hr_attendance/models/__init__.py | 1 + yuthon_hr_attendance/models/card_approval.py | 2 +- yuthon_hr_attendance/models/duty_approval.py | 4 +- yuthon_hr_attendance/models/go_approval.py | 4 +- .../models/overtime_approval.py | 25 ++++- yuthon_hr_attendance/models/overtime_page.py | 14 +++ .../security/ir.model.access.csv | 1 + yuthon_hr_attendance/views/card_approval.xml | 2 +- yuthon_hr_attendance/views/duty_approval.xml | 4 +- yuthon_hr_attendance/views/go_approval.xml | 4 +- .../views/overtime_approval.xml | 12 +- .../views/overtime_page_views.xml | 43 +++++++ yuthon_hr_employee/data/yuthon.job.lv.csv | 106 +++++++++--------- .../views/yuthon_job_lv_views.xml | 3 + .../models/inherit_hr_job.py | 2 - .../models/yuthon_recruitment_approval.py | 2 +- .../views/menuitem.xml | 2 +- .../views/yuthon_prepare_approval_views.xml | 2 +- yuthon_work_brand/views/hr_menus.xml | 50 ++++++--- 26 files changed, 228 insertions(+), 102 deletions(-) create mode 100644 yuthon_holiday/views/假期前端修改.xml create mode 100644 yuthon_holiday/wizard/__init__.py create mode 100644 yuthon_holiday/wizard/holiday_detail_wizard.py create mode 100644 yuthon_hr_attendance/models/overtime_page.py create mode 100644 yuthon_hr_attendance/views/overtime_page_views.xml diff --git a/soong_workflow/models/soong_workflow_node.py b/soong_workflow/models/soong_workflow_node.py index 6a923149f..c3dbdb17a 100644 --- a/soong_workflow/models/soong_workflow_node.py +++ b/soong_workflow/models/soong_workflow_node.py @@ -237,7 +237,7 @@ class SoongWorkflowNodeButton(models.Model): ) icon = fields.Char(string="Icon", help="Enter icon name like: fa-print, it's recommended to use FontAwesome Icons.", ) - has_comment = fields.Boolean(string="评论", default=False) + has_comment = fields.Boolean(string="意见", default=False) btn_key = fields.Char(string="Button Key", default=_generate_key) btn_hide = fields.Boolean( string="Hide Button if Condition isn't fulfilled", diff --git a/yuthon_holiday/__init__.py b/yuthon_holiday/__init__.py index 9a7e03ede..c536983e2 100644 --- a/yuthon_holiday/__init__.py +++ b/yuthon_holiday/__init__.py @@ -1 +1,2 @@ -from . import models \ No newline at end of file +from . import models +from . import wizard \ No newline at end of file diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index 09d80331c..4f2ec98be 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -61,6 +61,15 @@ class HolidaysRequestBatch(models.Model): self.state = 'draft' self.leave_ids.action_draft() + def holiday_datail_wizard(self): + return { + 'name': '请假详情', + 'type': 'ir.actions.act_window', + 'res_model': 'holiday.detail.wizard', + 'view_mode': 'form'} + + def put_modify_days(self): + pass class HrLeaveLine(models.Model): _name = 'hr.leave.line' @@ -72,10 +81,21 @@ class HrLeaveLine(models.Model): leave_documents_ids = fields.Many2many(related='leave_type_id.leave_documents_id', string="假期详情说明") start_time = fields.Date(string="开始时间") end_time = fields.Date(string="结束时间") - days = fields.Float(string="天数") - residual = fields.Float(string="剩余天数") - # - # @api.onchange('leave_type_id') - # def _onchange_leave_type_id(self): - # if self.leave_type_id: - # self.leave_documents_ids = self.leave_type_id.leave_documents_id + days = fields.Float(string="天数",compute='_compute_days') + residual = fields.Float(string="剩余天数",compute='_compute_remaining_days') + + + @api.depends('start_time', 'end_time') + def _compute_days(self): + for record in self: + if record.start_time and record.end_time: + delta = record.end_time - record.start_time + record.days = delta.days + else: + record.days = 0 + + @api.depends('available_days', 'days') + def _compute_remaining_days(self): + for record in self: + record.residual = record.available_days - record.days + diff --git a/yuthon_holiday/views/假期前端修改.xml b/yuthon_holiday/views/假期前端修改.xml new file mode 100644 index 000000000..9cb105523 --- /dev/null +++ b/yuthon_holiday/views/假期前端修改.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/yuthon_holiday/wizard/__init__.py b/yuthon_holiday/wizard/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/yuthon_holiday/wizard/holiday_detail_wizard.py b/yuthon_holiday/wizard/holiday_detail_wizard.py new file mode 100644 index 000000000..e0c9ef153 --- /dev/null +++ b/yuthon_holiday/wizard/holiday_detail_wizard.py @@ -0,0 +1,2 @@ +from odoo import models, fields, api +from odoo.exceptions import ValidationError \ No newline at end of file diff --git a/yuthon_hr_attendance/__manifest__.py b/yuthon_hr_attendance/__manifest__.py index e6a25e7fc..0328fc66f 100644 --- a/yuthon_hr_attendance/__manifest__.py +++ b/yuthon_hr_attendance/__manifest__.py @@ -28,6 +28,7 @@ 'views/go_approval.xml', 'views/duty_approval.xml', 'views/leave_approval.xml', + 'views/overtime_page_views.xml', 'views/remove_holiday_approval.xml', 'views/card_approval.xml', 'views/attendance_scheme.xml', diff --git a/yuthon_hr_attendance/models/__init__.py b/yuthon_hr_attendance/models/__init__.py index 83b2fa89f..27a7adb7d 100644 --- a/yuthon_hr_attendance/models/__init__.py +++ b/yuthon_hr_attendance/models/__init__.py @@ -20,6 +20,7 @@ from . import leave_approval from . import remove_holiday_approval from . import card_approval from . import planning_template_inherit +from . import overtime_page diff --git a/yuthon_hr_attendance/models/card_approval.py b/yuthon_hr_attendance/models/card_approval.py index ccb5c1f32..c203f1c87 100644 --- a/yuthon_hr_attendance/models/card_approval.py +++ b/yuthon_hr_attendance/models/card_approval.py @@ -30,4 +30,4 @@ class CardApprovalsLine(models.Model): replacement_time = fields.Datetime(string="补卡时间") actual_punch = fields.Datetime(string="实际打卡") reason = fields.Char(string="补卡原因") - documents_ids = fields.Many2many('documents.document', string="附件") \ No newline at end of file + documents_ids = fields.Many2many('ir.attachment', string="附件") \ No newline at end of file diff --git a/yuthon_hr_attendance/models/duty_approval.py b/yuthon_hr_attendance/models/duty_approval.py index 20003f6f5..d98a51e0b 100644 --- a/yuthon_hr_attendance/models/duty_approval.py +++ b/yuthon_hr_attendance/models/duty_approval.py @@ -16,6 +16,7 @@ class DutyApprovals(models.Model): users_id = fields.Many2one('res.users', string="申请人",default=lambda self: self.env.user.id) duty_ids = fields.One2many('duty.approval.line','duty_id',string="值班人明细") is_issues = fields.Boolean(string='是否上会') + reason_application = fields.Char(string="事由") related_issues_id = fields.Many2one('issue.library', string="关联议题") @api.depends('date_start', 'date_end') def _compute_duration(self): @@ -32,9 +33,8 @@ class DutyApprovalsLine(models.Model): duty_id = fields.Many2one('duty.approval', string="值班审批") duty_user_id = fields.Many2one('hr.employee', string="值班人员") - reason_application = fields.Char(string="事由") date_start = fields.Datetime(string="开始时间", default=fields.Datetime.now) date_end = fields.Datetime(string="结束时间") duration = fields.Float(string="时长") validity = fields.Char(string="有效期") - documents_ids = fields.Many2many('documents.document', string="附件") \ No newline at end of file + documents_ids = fields.Many2many('ir.attachment', string="附件") \ No newline at end of file diff --git a/yuthon_hr_attendance/models/go_approval.py b/yuthon_hr_attendance/models/go_approval.py index 1e419465c..6bafcce08 100644 --- a/yuthon_hr_attendance/models/go_approval.py +++ b/yuthon_hr_attendance/models/go_approval.py @@ -14,6 +14,7 @@ class GoApprovals(models.Model): code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('overtime_approval')) users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) department_id = fields.Many2one('hr.department', string="部门") + reason_application = fields.Char(string="事由") go_approval_ids = fields.One2many('go.approvals.line', 'go_approval_id', string="外出详情") is_issues = fields.Boolean(string='是否上会') related_issues_id = fields.Many2one('issue.library', string="关联议题") @@ -24,7 +25,6 @@ class GoApprovalsLine(models.Model): go_approval_id = fields.Many2one('go.approval', string="关联外出申请") overtime_people = fields.Many2one('hr.employee', string="外出人") - reason_application = fields.Char(string="事由") - documents_ids = fields.Many2many('documents.document', string="附件") + documents_ids = fields.Many2many('ir.attachment', string="附件") date_start = fields.Datetime(string="开始时间") date_end = fields.Datetime(string="结束时间") \ No newline at end of file diff --git a/yuthon_hr_attendance/models/overtime_approval.py b/yuthon_hr_attendance/models/overtime_approval.py index e49d846cf..115bf769a 100644 --- a/yuthon_hr_attendance/models/overtime_approval.py +++ b/yuthon_hr_attendance/models/overtime_approval.py @@ -9,13 +9,15 @@ class OvertimeApprovals(models.Model): _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin','soong.workflow.mixin'] _rec_name = 'name' - company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储')], string="公司") + yuthon_company = fields.Selection(related='users_id.employee_id.yuthon_company', string="公司") name = fields.Char(string="标题") code = fields.Char(string="编号",default=lambda self: self.env['ir.sequence'].next_by_code('overtime_approval')) users_id = fields.Many2one('res.users', string="申请人",default=lambda self: self.env.user.id) - overtime_approval_ids = fields.One2many('overtime.user.line', 'overtime_approval_id', string="加班审批行") - department_id = fields.Many2one('hr.department', string="部门") + overtime_approval_ids = fields.One2many('overtime.user.line', 'overtime_approval_id', string="加班审批行",default=lambda self: self._default_user_lines()) + reason_application = fields.Char(string="事由") + department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门") is_issues = fields.Boolean(string='是否上会') + details = fields.Text(string="加班说明") related_issues_id = fields.Many2one('issue.library', string="关联议题") @api.onchange('overtime_department_id') def onchange_overtime_users(self): @@ -48,6 +50,17 @@ class OvertimeApprovals(models.Model): })) over.overtime_user_ids = users_data_list + @api.onchange('yuthon_company') + def onchange_company(self): + for record in self: + overtime_id = record.env['overtime.page'].search([('yuthon_company', '=', record.yuthon_company)]) + record.details = (f"1、每天加班不得超过{overtime_id.day_time}\n" + f"2、每月加班不得超过{overtime_id.month_time}\n" + f"3、每年加班不得超过{overtime_id.year_time}") + + @api.model + def _default_user_lines(self): + return [(0, 0, {'users_id': self.env.user.id})] class OvertimeUserLine(models.Model): _name = 'overtime.user.line' @@ -55,15 +68,15 @@ class OvertimeUserLine(models.Model): _description = "加班明细行" overtime_approval_id = fields.Many2one('overtime.approval', string="加班单号") - overtime_people = fields.Many2one('hr.employee',string="加班人员") - reason_application = fields.Char(string="事由") + users_id = fields.Many2one('res.users',string="加班人员") department_id = fields.Many2one('hr.department', string="部门") overtime_hours = fields.Float(string="本月加班时长") - documents_ids = fields.Many2many('documents.document', string="附件") + documents_ids = fields.Many2many('ir.attachment', string="附件") start_time = fields.Datetime(string="开始时间") end_time = fields.Datetime(string="结束时间") hours = fields.Float(string="加班时长") type_overtime = fields.Selection([('work', '工作日加班'), ('weekend', '周末加班'), ('holiday', '节假日加班')], string="加班类型") + # def attendance_button(self): # return { # 'type': 'ir.actions.client', diff --git a/yuthon_hr_attendance/models/overtime_page.py b/yuthon_hr_attendance/models/overtime_page.py new file mode 100644 index 000000000..d192106d1 --- /dev/null +++ b/yuthon_hr_attendance/models/overtime_page.py @@ -0,0 +1,14 @@ +from odoo import api, fields, models, tools, _ +from datetime import datetime, time, timedelta + + +class OvertimePage(models.Model): + _name = 'overtime.page' + _description = '加班说明配置' + + yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'), ('thlc', '天河粮储'), + ('tctj', '天投城建')], string='公司') + department_id = fields.Many2one("hr.department", string="部门") + day_time = fields.Char(string="每日加班时长不得超过") + month_time = fields.Char(string="每月加班时长不得超过") + year_time = fields.Char(string="每年加班时长不得超过") diff --git a/yuthon_hr_attendance/security/ir.model.access.csv b/yuthon_hr_attendance/security/ir.model.access.csv index 21a28e167..c376c08f5 100644 --- a/yuthon_hr_attendance/security/ir.model.access.csv +++ b/yuthon_hr_attendance/security/ir.model.access.csv @@ -10,3 +10,4 @@ access_card_approvals_line,card.approval.line,model_card_approvals_line,base.gro access_go_approvals_line,go.approvals.line,model_go_approvals_line,base.group_user,1,1,1,1 access_overtime_user_line,overtime.user.line,model_overtime_user_line,base.group_user,1,1,1,1 access_duty_approval_line,duty.approval.line,model_duty_approval_line,base.group_user,1,1,1,1 +access_overtime_page,overtime.page,model_overtime_page,base.group_user,1,1,1,1 diff --git a/yuthon_hr_attendance/views/card_approval.xml b/yuthon_hr_attendance/views/card_approval.xml index a02968e37..876a4f1f5 100644 --- a/yuthon_hr_attendance/views/card_approval.xml +++ b/yuthon_hr_attendance/views/card_approval.xml @@ -47,7 +47,7 @@ - + diff --git a/yuthon_hr_attendance/views/duty_approval.xml b/yuthon_hr_attendance/views/duty_approval.xml index f507198b8..cf258375e 100644 --- a/yuthon_hr_attendance/views/duty_approval.xml +++ b/yuthon_hr_attendance/views/duty_approval.xml @@ -32,6 +32,7 @@ + @@ -44,8 +45,7 @@ - - + diff --git a/yuthon_hr_attendance/views/go_approval.xml b/yuthon_hr_attendance/views/go_approval.xml index e0365b4b5..701c6da9b 100644 --- a/yuthon_hr_attendance/views/go_approval.xml +++ b/yuthon_hr_attendance/views/go_approval.xml @@ -33,6 +33,7 @@ + @@ -45,8 +46,7 @@ - - + diff --git a/yuthon_hr_attendance/views/overtime_approval.xml b/yuthon_hr_attendance/views/overtime_approval.xml index 16f29c1d1..2f5ce07d2 100644 --- a/yuthon_hr_attendance/views/overtime_approval.xml +++ b/yuthon_hr_attendance/views/overtime_approval.xml @@ -1,6 +1,5 @@ - overtime.approval.tree overtime.approval @@ -8,7 +7,7 @@ - + @@ -27,14 +26,16 @@ - + + + @@ -43,13 +44,12 @@ - + - - + diff --git a/yuthon_hr_attendance/views/overtime_page_views.xml b/yuthon_hr_attendance/views/overtime_page_views.xml new file mode 100644 index 000000000..904eb53cd --- /dev/null +++ b/yuthon_hr_attendance/views/overtime_page_views.xml @@ -0,0 +1,43 @@ + + + + overtime.page.tree + overtime.page + + + + + + + + + overtime.page.form + overtime.page + +
+ + + + + + + + + + + + + + + +
+ + + + 加班时长配置 + overtime.page + tree,form + + + + diff --git a/yuthon_hr_employee/data/yuthon.job.lv.csv b/yuthon_hr_employee/data/yuthon.job.lv.csv index 8439dffb4..c1def8b4f 100644 --- a/yuthon_hr_employee/data/yuthon.job.lv.csv +++ b/yuthon_hr_employee/data/yuthon.job.lv.csv @@ -1,53 +1,53 @@ -"name","base_wage","job_wage","post_wage","performance_bonus","phone_subsidy","attendance_bonus","all_wage","create_time","end_time","yuthon_company" -"部门经理一档","5300.0","5087.0","0.0","2800.0","300.0","200.0","13687.0","","","thtz" -"部门经理二档","5300.0","4717.0","0.0","2800.0","300.0","200.0","13317.0","","","thtz" -"部门经理三档","5300.0","4363.0","0.0","2800.0","300.0","200.0","12963.0","","","thtz" -"部门经理四档","5300.0","4022.0","0.0","2800.0","300.0","200.0","12622.0","","","thtz" -"部门经理五档","5300.0","3694.0","0.0","2800.0","300.0","200.0","12294.0","","","thtz" -"部门经理六档","5300.0","3379.0","0.0","2800.0","300.0","200.0","11979.0","","","thtz" -"部门经理七档","5300.0","3076.0","0.0","2800.0","300.0","200.0","11676.0","","","thtz" -"部门经理八档","5300.0","2785.0","0.0","2800.0","300.0","200.0","11385.0","","","thtz" -"部门副经理一档","4800.0","3648.0","0.0","2500.0","300.0","200.0","11448.0","","","thtz" -"部门副经理二档","4800.0","3354.0","0.0","2500.0","300.0","200.0","11154.0","","","thtz" -"部门副经理三档","4800.0","3072.0","0.0","2500.0","300.0","200.0","10872.0","","","thtz" -"部门副经理四档","4800.0","2800.0","0.0","2500.0","300.0","200.0","10600.0","","","thtz" -"部门副经理五档","4800.0","2537.0","0.0","2500.0","300.0","200.0","10337.0","","","thtz" -"部门副经理六档","4800.0","2286.0","0.0","2500.0","300.0","200.0","10086.0","","","thtz" -"部门副经理七档","4800.0","2045.0","0.0","2500.0","300.0","200.0","9845.0","","","thtz" -"部门副经理八档","4800.0","1812.0","0.0","2500.0","300.0","200.0","9612.0","","","thtz" -"业务主管一档","4000.0","2603.0","0.0","2200.0","300.0","200.0","9303.0","","","thtz" -"业务主管二档","4000.0","2367.0","0.0","2200.0","300.0","200.0","9067.0","","","thtz" -"业务主管三档","4000.0","2143.0","0.0","2200.0","300.0","200.0","8843.0","","","thtz" -"业务主管四档","4000.0","1926.0","0.0","2200.0","300.0","200.0","8626.0","","","thtz" -"业务主管五档","4000.0","1716.0","0.0","2200.0","300.0","200.0","8416.0","","","thtz" -"业务主管六档","4000.0","1516.0","0.0","2200.0","300.0","200.0","8216.0","","","thtz" -"业务主管七档","4000.0","1324.0","0.0","2200.0","300.0","200.0","8024.0","","","thtz" -"业务主管八档","4000.0","1138.0","0.0","2200.0","300.0","200.0","7838.0","","","thtz" -"高级职员一档","3500.0","1870.0","0.0","2000.0","300.0","200.0","7870.0","","","thtz" -"高级职员二档","3500.0","1682.0","0.0","2000.0","300.0","200.0","7682.0","","","thtz" -"高级职员三档","3500.0","1502.0","0.0","2000.0","300.0","200.0","7502.0","","","thtz" -"高级职员四档","3500.0","1329.0","0.0","2000.0","300.0","200.0","7329.0","","","thtz" -"高级职员五档","3500.0","1162.0","0.0","2000.0","300.0","200.0","7162.0","","","thtz" -"高级职员六档","3500.0","1003.0","0.0","2000.0","300.0","200.0","7003.0","","","thtz" -"高级职员七档","3500.0","848.0","0.0","2000.0","300.0","200.0","6848.0","","","thtz" -"高级职员八档","3500.0","701.0","0.0","2000.0","300.0","200.0","6701.0","","","thtz" -"一级员工一档","3000.0","1385.0","0.0","1800.0","300.0","200.0","6685.0","","","thtz" -"一级员工二档","3000.0","1236.0","0.0","1800.0","300.0","200.0","6536.0","","","thtz" -"一级员工三档","3000.0","1093.0","0.0","1800.0","300.0","200.0","6393.0","","","thtz" -"一级员工四档","3000.0","955.0","0.0","1800.0","300.0","200.0","6255.0","","","thtz" -"一级员工五档","3000.0","821.0","0.0","1800.0","300.0","200.0","6121.0","","","thtz" -"一级员工六档","3000.0","694.0","0.0","1800.0","300.0","200.0","5994.0","","","thtz" -"一级员工七档","3000.0","571.0","0.0","1800.0","300.0","200.0","5871.0","","","thtz" -"一级员工八档","3000.0","453.0","0.0","1800.0","300.0","200.0","5753.0","","","thtz" -"二级员工一档","2600.0","1001.0","0.0","1600.0","300.0","200.0","5701.0","","","thtz" -"二级员工二档","2600.0","881.0","0.0","1600.0","300.0","200.0","5581.0","","","thtz" -"二级员工三档","2600.0","767.0","0.0","1600.0","300.0","200.0","5467.0","","","thtz" -"二级员工四档","2600.0","656.0","0.0","1600.0","300.0","200.0","5356.0","","","thtz" -"二级员工五档","2600.0","550.0","0.0","1600.0","300.0","200.0","5250.0","","","thtz" -"二级员工六档","2600.0","448.0","0.0","1600.0","300.0","200.0","5148.0","","","thtz" -"二级员工七档","2600.0","350.0","0.0","1600.0","300.0","200.0","5050.0","","","thtz" -"二级员工八档","2600.0","256.0","0.0","1600.0","300.0","200.0","4956.0","","","thtz" -"厨师","2400.0","2500.0","0.0","0.0","0.0","0.0","4900.0","","","thtz" -"厨工","2400.0","700.0","500.0","0.0","0.0","0.0","3600.0","","","thtz" -"保洁","2400.0","763.0","4000.0","0.0","0.0","0.0","7163.0","","","thtz" -"实习生","2300.0","0.0","0.0","0.0","300.0","200.0","2800.0","","","thtz" +"lv","name","base_wage","job_wage","post_wage","performance_bonus","phone_subsidy","attendance_bonus","all_wage","create_time","end_time","yuthon_company" +"部门经理","部门经理一档","530","50.0","0.0","280","30","20","136.0","","","thtz" +"部门经理","部门经理二档","530","47.0","0.0","280","30","20","133.0","","","thtz" +"部门经理","部门经理三档","530","43.0","0.0","280","30","20","129.0","","","thtz" +"部门经理","部门经理四档","530","40.0","0.0","280","30","20","126.0","","","thtz" +"部门经理","部门经理五档","530","36.0","0.0","280","30","20","122.0","","","thtz" +"部门经理","部门经理六档","530","33.0","0.0","280","30","20","119.0","","","thtz" +"部门经理","部门经理七档","530","30.0","0.0","280","30","20","116.0","","","thtz" +"部门经理","部门经理八档","530","27.0","0.0","280","30","20","113.0","","","thtz" +"部门副经理","部门副经理一档","480","36.0","0.0","250","30","20","114.0","","","thtz" +"部门副经理","部门副经理二档","480","33.0","0.0","250","30","20","111.0","","","thtz" +"部门副经理","部门副经理三档","480","30.0","0.0","250","30","20","108.0","","","thtz" +"部门副经理","部门副经理四档","480","28","0.0","250","30","20","100","","","thtz" +"部门副经理","部门副经理五档","480","25.0","0.0","250","30","20","103.0","","","thtz" +"部门副经理","部门副经理六档","480","22.0","0.0","250","30","20","100.0","","","thtz" +"部门副经理","部门副经理七档","480","20.0","0.0","250","30","20","984.0","","","thtz" +"部门副经理","部门副经理八档","480","18.0","0.0","250","30","20","961.0","","","thtz" +"业务主管","业务主管一档","400","26.0","0.0","220","30","20","93.0","","","thtz" +"业务主管","业务主管二档","400","23.0","0.0","220","30","20","907.0","","","thtz" +"业务主管","业务主管三档","400","21.0","0.0","220","30","20","88.0","","","thtz" +"业务主管","业务主管四档","400","19.0","0.0","220","30","20","862.0","","","thtz" +"业务主管","业务主管五档","400","17.0","0.0","220","30","20","846.0","","","thtz" +"业务主管","业务主管六档","400","15.0","0.0","220","30","20","826.0","","","thtz" +"业务主管","业务主管七档","400","13.0","0.0","220","30","20","804.0","","","thtz" +"业务主管","业务主管八档","400","18.0","0.0","220","30","20","788.0","","","thtz" +"高级职员","高级职员一档","350","18.0","0.0","200","30","20","70.0","","","thtz" +"高级职员","高级职员二档","350","16.0","0.0","200","30","20","72.0","","","thtz" +"高级职员","高级职员三档","350","15.0","0.0","200","30","20","902.0","","","thtz" +"高级职员","高级职员四档","350","13.0","0.0","200","30","20","79.0","","","thtz" +"高级职员","高级职员五档","350","11.0","0.0","200","30","20","71.0","","","thtz" +"高级职员","高级职员六档","350","10.0","0.0","200","30","20","73.0","","","thtz" +"高级职员","高级职员七档","350","84.0","0.0","200","30","20","68.0","","","thtz" +"高级职员","高级职员八档","350","71.0","0.0","200","30","20","67.0","","","thtz" +"一级员工","一级员工一档","300","13.0","0.0","180","30","20","85.0","","","thtz" +"一级员工","一级员工二档","300","12.0","0.0","180","30","20","653.0","","","thtz" +"一级员工","一级员工三档","300","10.0","0.0","180","30","20","633.0","","","thtz" +"一级员工","一级员工四档","300","95.0","0.0","180","30","20","625.0","","","thtz" +"一级员工","一级员工五档","300","82.0","0.0","180","30","20","611.0","","","thtz" +"一级员工","一级员工六档","300","69.0","0.0","180","30","20","594.0","","","thtz" +"一级员工","一级员工七档","300","57.0","0.0","180","30","20","581.0","","","thtz" +"一级员工","一级员工八档","300","45.0","0.0","180","30","20","573.0","","","thtz" +"二级员工","二级员工一档","260","11.0","0.0","160","30","20","571.0","","","thtz" +"二级员工","二级员工二档","260","88.0","0.0","160","30","20","558.0","","","thtz" +"二级员工","二级员工三档","260","77.0","0.0","160","30","20","547.0","","","thtz" +"二级员工","二级员工四档","260","65.0","0.0","160","30","20","535.0","","","thtz" +"二级员工","二级员工五档","260","55.0","0.0","160","30","20","550.0","","","thtz" +"二级员工","二级员工六档","260","48.0","0.0","160","30","20","548.0","","","thtz" +"二级员工","二级员工七档","260","30.0","0.0","160","30","20","500.0","","","thtz" +"二级员工","二级员工八档","260","26.0","0.0","160","30","20","496.0","","","thtz" +"其他","厨师","24","20","0.0","0.0","0.0","0.0","49","","","thtz" +"其他","厨工","24","7","50","0.0","0.0","0.0","36","","","thtz" +"其他","保洁","24","73.0","400","0.0","0.0","0.0","71.0","","","thtz" +"其他","实习生","23","0.0","0.0","0.0","30","20","28","","","thtz" diff --git a/yuthon_hr_employee/views/yuthon_job_lv_views.xml b/yuthon_hr_employee/views/yuthon_job_lv_views.xml index 1f78f0bc5..2498c7fb9 100644 --- a/yuthon_hr_employee/views/yuthon_job_lv_views.xml +++ b/yuthon_hr_employee/views/yuthon_job_lv_views.xml @@ -41,6 +41,7 @@ yuthon.job.lv tree [('yuthon_company', '=', 'thtz')] + {'search_default_group_lv': 1} @@ -67,6 +68,7 @@ yuthon.job.lv tree [('yuthon_company', '=', 'thwg')] + {'search_default_group_lv': 1} @@ -76,6 +78,7 @@ yuthon.job.lv tree [('yuthon_company', '=', 'thlc')] + {'search_default_group_lv': 1} + sequence="9"/> diff --git a/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml index 66b3acb20..f1db81b81 100644 --- a/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml @@ -54,7 +54,7 @@ - 待开发 + 岗位编制调整 yuthon.prepare.approval tree,form diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index 9f76ab347..b8156add7 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -25,6 +25,7 @@ False + False @@ -33,6 +34,10 @@ False + + + False + False @@ -72,63 +77,77 @@ parent="hr_recruitment_setting_menu_board" action="hr_recruitment.action_hr_recruitment_configuration" sequence="1"/> - + + + @@ -394,6 +413,11 @@ parent="attendance_resources_setting_root_board" sequence="3" action="resource.action_resource_calendar_form"/> +