diff --git a/yuthon_hr_employee/__manifest__.py b/yuthon_hr_employee/__manifest__.py index 401fb3e40..a111a18d1 100644 --- a/yuthon_hr_employee/__manifest__.py +++ b/yuthon_hr_employee/__manifest__.py @@ -13,9 +13,11 @@ 'website': 'https://www.pengyuthon.com', 'depends': ['hr'], 'data': [ - 'date/user_role_date.xml', + 'data/hr_department_data.xml', + 'data/user_role_data.xml', 'security/ir.model.access.csv', 'views/yuthon_hr_employee_views.xml', + 'views/yuthon_hr_department_views.xml', 'views/yuthon_job_lv_views.xml', 'views/yuthon_user_role_views.xml', ], diff --git a/yuthon_hr_employee/data/hr_department_data.xml b/yuthon_hr_employee/data/hr_department_data.xml new file mode 100644 index 000000000..fa22a6437 --- /dev/null +++ b/yuthon_hr_employee/data/hr_department_data.xml @@ -0,0 +1,127 @@ + + + + 天河投资 + False + False + + + + 新兴协会 + 广州市天河区龙口西路90号天成大厦3楼东侧 + True + False + + + + 科创中心 + 广州市天河区龙口西路90号天成大厦4楼东侧 + True + False + + + + 管理员 + 广州市天河区龙口西路90号天成大厦5楼东侧 + False + False + + + + 外派 + 广州市天河区龙口西路90号天成大厦6楼东侧 + False + False + + + + 粮储公司 + 广州市天河区龙口西路90号天成大厦7楼东侧 + False + False + + + + 商业总公司 + 广州市天河区龙口西路90号天成大厦8楼东侧 + False + False + + + + 领导班子 + 广州市天河区龙口西路90号天成大厦9楼东侧 + False + False + + + + 财务部 + 广州市天河区龙口西路90号天成大厦10楼东侧 + False + False + + + + 办公室 + 广州市天河区龙口西路90号天成大厦11楼东侧 + False + False + + + + 企业管理部 + 广州市天河区龙口西路90号天成大厦12楼东侧 + False + False + + + + 租务二部(原物业经营部) + 广州市天河区龙口西路90号天成大厦13楼东侧 + False + False + + + + 资本运营部 + 广州市天河区龙口西路90号天成大厦14楼东侧 + False + False + + + + 投资发展部 + 广州市天河区龙口西路90号天成大厦15楼东侧 + False + False + + + + 党群人力资源部 + 广州市天河区龙口西路90号天成大厦16楼东侧 + False + False + + + + 风控审计部 + 广州市天河区龙口西路90号天成大厦17楼东侧 + False + False + + + + 人事部 + 广州市天河区龙口西路90号天成大厦18楼东侧 + False + False + + + + 厨位人员 + 广州市天河区龙口西路90号天成大厦19楼东侧 + False + False + + \ No newline at end of file diff --git a/yuthon_hr_employee/date/user_role_date.xml b/yuthon_hr_employee/data/user_role_data.xml similarity index 52% rename from yuthon_hr_employee/date/user_role_date.xml rename to yuthon_hr_employee/data/user_role_data.xml index 4b28b6f68..7ad3af9d0 100644 --- a/yuthon_hr_employee/date/user_role_date.xml +++ b/yuthon_hr_employee/data/user_role_data.xml @@ -2,397 +2,397 @@ 普通员工 - System global role + system_global_user 常务副秘书长 - Departmental private role - association + departmental_role + association 总经理 - System global role + system_global_user 理事长 - System global role + system_global_user 常务副会长 - System global role + system_global_user 副总经理 - System global role + system_global_user 监事会主席 - System global role + system_global_user 秘书处办公室主任 - System global role + system_global_user 分管领导 - System global role + system_global_user 部门副经理 - System global role + system_global_user 秘书处办公室副主任 - System global role + system_global_user 部门经理 - System global role + system_global_user 各企业班子（发文） - System global role + system_global_user 试用期员工 - System global role + system_global_user 物业部副总经理 - Departmental private role - Leasing Department II (Former Property Management Department + departmental_role + rent2 理事会成员 - System global role + system_global_user 安全办成员 - System global role + system_global_user 实习 - System global role + system_global_user 副院长 - System global role + system_global_user 院长 - System global role + system_global_user 党员 - System global role + system_global_user 科创中心 - System global role + system_global_user 需考勤人员 - System global role + system_global_user 财务(物业) - System global role + system_global_user 集团安委会 - System global role - + system_global_user 天投城建安全办 - System global role + system_global_user 集团安全办 - System global role + system_global_user 天投城建安委会 - System global role + system_global_user 天投城建安委会 - System global role + system_global_user 公司领导 - System global role + system_global_user 领导班子 - System global role + system_global_user 董事长 - System global role + system_global_user 执行董事 - Departmental private role - Grain storage company - + departmental_role + storage_company 秘书长 - Departmental private role - association + departmental_role + association + 副主任 - System global role + system_global_user 工会委员 - System global role + system_global_user 风控审计经理 - Departmental private role - Risk Control Audit Department + departmental_role + risk_department 风控管理岗 - Departmental private role - Risk Control Audit Department + departmental_role + risk_department 系统管理员 - OA administrator + oa_admin 安全办副主任 - System global role + system_global_user 投融资部经理 - Departmental private role - Capital Operations Department + departmental_role + capital_department 投融资部副总经理 - Departmental private role - Capital Operations Department + departmental_role + capital_department + 投融资部副经理 - Departmental private role - Capital Operations Department + departmental_role + capital_department 投融资发展部 - Departmental private role - Capital Operations Department + departmental_role + capital_department 项目开发部 - Departmental private role - Investment development department + departmental_role + investment_department 项目部经理 - Departmental private role - Investment development department - + departmental_role + investment_department 人事专员 - Departmental private role - Party and Mass Human Resources Department + departmental_role + party_department 党建专员 - Departmental private role - Party and Mass Human Resources Department + departmental_role + party_department 人事管理员 - Departmental private role - Party and Mass Human Resources Department + departmental_role + party_department 人事主管 - Departmental private role - Party and Mass Human Resources Department + departmental_role + party_department 物业部 - Departmental private role - Leasing Department II (Former Property Management Department + departmental_role + rent2 物业部经理 - Departmental private role - Leasing Department II (Former Property Management Department + departmental_role + rent2 物业部副经理 - Departmental private role - Leasing Department II (Former Property Management Department + departmental_role + rent2 工程主管 - Departmental private role - Leasing Department II (Former Property Management Department + departmental_role + rent2 企业管理部 - Departmental private role - enterprise management department + departmental_role + enterprise_department 企业管理部经理 - Departmental private role - enterprise management department + departmental_role + enterprise_department 财务部 - Departmental private role - accounting department + departmental_role + accounting_department 财务部经理 - Departmental private role - accounting department + departmental_role + accounting_department 财务部副经理 - Departmental private role - accounting department + departmental_role + accounting_department 会计 - Departmental private role - accounting department + departmental_role + accounting_department 出纳 - Departmental private role - accounting department + departmental_role + accounting_department 办公室 - Departmental private role - administration office + departmental_role + office 主任 - Departmental private role - administration office + departmental_role + office 办公室副主任 - Departmental private role - administration office + departmental_role + office 公文管理员 - Departmental private role - administration office + departmental_role + office 厨卫人员 - Departmental private role - administration office + departmental_role + office 办公库管 - Departmental private role - administration office + departmental_role + office 子企业人员 - Departmental private role - administration office + departmental_role + office 信息发布员 - Departmental private role - administration office + departmental_role + office 交通安全员 - System global role + system_global_user + 外派 - Departmental private role - expatriate + departmental_role + expatriate diff --git a/yuthon_hr_employee/models/__init__.py b/yuthon_hr_employee/models/__init__.py index 6a8a4dc2b..e5f40cb28 100644 --- a/yuthon_hr_employee/models/__init__.py +++ b/yuthon_hr_employee/models/__init__.py @@ -1,3 +1,4 @@ from . import yuthon_hr_employee from . import yuthon_job_lv from . import yuthon_user_role +from . import yuthon_hr_department diff --git a/yuthon_hr_employee/models/yuthon_hr_department.py b/yuthon_hr_employee/models/yuthon_hr_department.py new file mode 100644 index 000000000..49e40e4fc --- /dev/null +++ b/yuthon_hr_employee/models/yuthon_hr_department.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, _ + + +class YuthonHrDepartment(models.Model): + _inherit = "hr.department" + + department_phone = fields.Char(string="部门电话") + department_fax = fields.Char(string="部门传真") + department_location = fields.Char(string="部门地址") + department_function = fields.Char(string="部门职能") + is_institution = fields.Boolean(string="是否机构") + is_global_department = fields.Boolean(string="是否全局部门") + create_time = fields.Datetime(string="创建时间", default=fields.Datetime.now) + end_time = fields.Datetime(string="结束时间") diff --git a/yuthon_hr_employee/models/yuthon_user_role.py b/yuthon_hr_employee/models/yuthon_user_role.py index 92cda2235..87dcf3822 100644 --- a/yuthon_hr_employee/models/yuthon_user_role.py +++ b/yuthon_hr_employee/models/yuthon_user_role.py @@ -6,20 +6,19 @@ class YuthonUserRole(models.Model): _name = 'yuthon.user.role' name = fields.Char(string="角色名称") - user_type = fields.Selection([("OA administrator", "OA管理员"), - ("System global role", "系统全局角色"), - ("Departmental private role", "部门私有角色")], string="角色类型") - Affiliated_organization_department = fields.Selection( - [("Leasing Department II (Former Property Management Department", "租务二部（原物业经营部）"), - ("Grain storage company", "粮储公司"), - ("association", "协会"), - ("Risk Control Audit Department", "风控审计部"), - ("Capital Operations Department", "资本运营部"), - ("Investment development department", "投资发展部"), - ("Party and Mass Human Resources Department", "党群人力资源部"), - ("enterprise management department", "企业管理部"), - ("accounting department", "财务部"), - ("administration office", "办公室"), - ("expatriate", "外派")],string = "所属机构部门") + user_type = fields.Selection([("oa_admin", "OA管理员"), + ("system_global_user", "系统全局角色"), + ("departmental_role", "部门私有角色")], string="角色类型") + organ_department = fields.Selection([("rent2", "租务二部(原物业经营部)"), + ("storage_company", "粮储公司"), + ("association", "协会"), + ("risk_department", "风控审计部"), + ("capital_department", "资本运营部"), + ("investment_department", "投资发展部"), + ("party_department", "党群人力资源部"), + ("enterprise_department", "企业管理部"), + ("accounting_department", "财务部"), + ("office", "办公室"), + ("expatriate", "外派")], string="所属机构部门") create_time = fields.Datetime(string="创建时间", default=fields.Datetime.now) end_time = fields.Datetime(string="结束时间") diff --git a/yuthon_hr_employee/views/yuthon_hr_department_views.xml b/yuthon_hr_employee/views/yuthon_hr_department_views.xml new file mode 100644 index 000000000..ade7f7053 --- /dev/null +++ b/yuthon_hr_employee/views/yuthon_hr_department_views.xml @@ -0,0 +1,20 @@ + + + + yuthon.hr.department.inherit + hr.department + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yuthon_hr_employee/views/yuthon_user_role_views.xml b/yuthon_hr_employee/views/yuthon_user_role_views.xml index 8274198e9..b72246b90 100644 --- a/yuthon_hr_employee/views/yuthon_user_role_views.xml +++ b/yuthon_hr_employee/views/yuthon_user_role_views.xml @@ -1,26 +1,30 @@ - - yuthon.job.lv.tree - yuthon.job.lv + + yuthon.user.role.tree + yuthon.user.role + + + + - - 职级配置 - yuthon.job.lv + + 角色配置 + yuthon.user.role tree,form + sequence="6"/> \ No newline at end of file