diff --git a/preview_easy/static/src/xml/qweb.xml b/preview_easy/static/src/xml/qweb.xml index 4410d398c..aec7dddce 100644 --- a/preview_easy/static/src/xml/qweb.xml +++ b/preview_easy/static/src/xml/qweb.xml @@ -11,7 +11,6 @@ + diff --git a/yuthon_hr_employee/__manifest__.py b/yuthon_hr_employee/__manifest__.py index 1d7e09055..cdabd4f59 100644 --- a/yuthon_hr_employee/__manifest__.py +++ b/yuthon_hr_employee/__manifest__.py @@ -29,6 +29,7 @@ 'views/inherit_hr_applicant_views.xml', 'views/publish_applicant_setting_views.xml', 'views/yuthon_job_postings_views.xml', + 'views/website_employee_views.xml' ], 'installable': True, 'application': False, diff --git a/yuthon_hr_employee/data/yuthon.job.lv.csv b/yuthon_hr_employee/data/yuthon.job.lv.csv index a67a09b8b..8439dffb4 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" -"部门经理一档","5300.0","5087.0","0.0","2800.0","300.0","200.0","13687.0","","", -"部门经理二档","5300.0","4717.0","0.0","2800.0","300.0","200.0","13317.0","","", -"部门经理三档","5300.0","4363.0","0.0","2800.0","300.0","200.0","12963.0","","", -"部门经理四档","5300.0","4022.0","0.0","2800.0","300.0","200.0","12622.0","","", -"部门经理五档","5300.0","3694.0","0.0","2800.0","300.0","200.0","12294.0","","", -"部门经理六档","5300.0","3379.0","0.0","2800.0","300.0","200.0","11979.0","","", -"部门经理七档","5300.0","3076.0","0.0","2800.0","300.0","200.0","11676.0","","", -"部门经理八档","5300.0","2785.0","0.0","2800.0","300.0","200.0","11385.0","","", -"部门副经理一档","4800.0","3648.0","0.0","2500.0","300.0","200.0","11448.0","","", -"部门副经理二档","4800.0","3354.0","0.0","2500.0","300.0","200.0","11154.0","","", -"部门副经理三档","4800.0","3072.0","0.0","2500.0","300.0","200.0","10872.0","","", -"部门副经理四档","4800.0","2800.0","0.0","2500.0","300.0","200.0","10600.0","","", -"部门副经理五档","4800.0","2537.0","0.0","2500.0","300.0","200.0","10337.0","","", -"部门副经理六档","4800.0","2286.0","0.0","2500.0","300.0","200.0","10086.0","","", -"部门副经理七档","4800.0","2045.0","0.0","2500.0","300.0","200.0","9845.0","","", -"部门副经理八档","4800.0","1812.0","0.0","2500.0","300.0","200.0","9612.0","","", -"业务主管一档","4000.0","2603.0","0.0","2200.0","300.0","200.0","9303.0","","", -"业务主管二档","4000.0","2367.0","0.0","2200.0","300.0","200.0","9067.0","","", -"业务主管三档","4000.0","2143.0","0.0","2200.0","300.0","200.0","8843.0","","", -"业务主管四档","4000.0","1926.0","0.0","2200.0","300.0","200.0","8626.0","","", -"业务主管五档","4000.0","1716.0","0.0","2200.0","300.0","200.0","8416.0","","", -"业务主管六档","4000.0","1516.0","0.0","2200.0","300.0","200.0","8216.0","","", -"业务主管七档","4000.0","1324.0","0.0","2200.0","300.0","200.0","8024.0","","", -"业务主管八档","4000.0","1138.0","0.0","2200.0","300.0","200.0","7838.0","","", -"高级职员一档","3500.0","1870.0","0.0","2000.0","300.0","200.0","7870.0","","", -"高级职员二档","3500.0","1682.0","0.0","2000.0","300.0","200.0","7682.0","","", -"高级职员三档","3500.0","1502.0","0.0","2000.0","300.0","200.0","7502.0","","", -"高级职员四档","3500.0","1329.0","0.0","2000.0","300.0","200.0","7329.0","","", -"高级职员五档","3500.0","1162.0","0.0","2000.0","300.0","200.0","7162.0","","", -"高级职员六档","3500.0","1003.0","0.0","2000.0","300.0","200.0","7003.0","","", -"高级职员七档","3500.0","848.0","0.0","2000.0","300.0","200.0","6848.0","","", -"高级职员八档","3500.0","701.0","0.0","2000.0","300.0","200.0","6701.0","","", -"一级员工一档","3000.0","1385.0","0.0","1800.0","300.0","200.0","6685.0","","", -"一级员工二档","3000.0","1236.0","0.0","1800.0","300.0","200.0","6536.0","","", -"一级员工三档","3000.0","1093.0","0.0","1800.0","300.0","200.0","6393.0","","", -"一级员工四档","3000.0","955.0","0.0","1800.0","300.0","200.0","6255.0","","", -"一级员工五档","3000.0","821.0","0.0","1800.0","300.0","200.0","6121.0","","", -"一级员工六档","3000.0","694.0","0.0","1800.0","300.0","200.0","5994.0","","", -"一级员工七档","3000.0","571.0","0.0","1800.0","300.0","200.0","5871.0","","", -"一级员工八档","3000.0","453.0","0.0","1800.0","300.0","200.0","5753.0","","", -"二级员工一档","2600.0","1001.0","0.0","1600.0","300.0","200.0","5701.0","","", -"二级员工二档","2600.0","881.0","0.0","1600.0","300.0","200.0","5581.0","","", -"二级员工三档","2600.0","767.0","0.0","1600.0","300.0","200.0","5467.0","","", -"二级员工四档","2600.0","656.0","0.0","1600.0","300.0","200.0","5356.0","","", -"二级员工五档","2600.0","550.0","0.0","1600.0","300.0","200.0","5250.0","","", -"二级员工六档","2600.0","448.0","0.0","1600.0","300.0","200.0","5148.0","","", -"二级员工七档","2600.0","350.0","0.0","1600.0","300.0","200.0","5050.0","","", -"二级员工八档","2600.0","256.0","0.0","1600.0","300.0","200.0","4956.0","","", -"厨师","2400.0","2500.0","0.0","0.0","0.0","0.0","4900.0","","", -"厨工","2400.0","700.0","500.0","0.0","0.0","0.0","3600.0","","", -"保洁","2400.0","763.0","4000.0","0.0","0.0","0.0","7163.0","","", -"实习生","2300.0","0.0","0.0","0.0","300.0","200.0","2800.0","","", +"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" diff --git a/yuthon_hr_employee/models/yuthon_job_lv.py b/yuthon_hr_employee/models/yuthon_job_lv.py index 1ca797a4e..c439bfc16 100644 --- a/yuthon_hr_employee/models/yuthon_job_lv.py +++ b/yuthon_hr_employee/models/yuthon_job_lv.py @@ -6,7 +6,10 @@ from datetime import datetime class YuthonJobLv(models.Model): _name = 'yuthon.job.lv' + _description = "职级管理" + _order = 'lv desc' + lv = fields.Integer(string="级别") name = fields.Char(string="职级名称") base_wage = fields.Float(string="基本工资") job_wage = fields.Float(string="职级工资") @@ -16,9 +19,11 @@ class YuthonJobLv(models.Model): attendance_bonus = fields.Float(string="全勤奖") all_wage = fields.Float(string="应发工资") + yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'), + ('thlc', '天河粮储'), ('tctj', '天投城建')], string="所属公司") create_time = fields.Datetime(string="生效日期", default=fields.Datetime.now) end_time = fields.Datetime(string="失效日期") company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储'), ('thjtzb','天河集团总部')], string="公司") - def pub_lv_approval(self): - pass + # def pub_lv_approval(self): + # pass diff --git a/yuthon_hr_employee/views/website_employee_views.xml b/yuthon_hr_employee/views/website_employee_views.xml index 0b872170c..65eba56f2 100644 --- a/yuthon_hr_employee/views/website_employee_views.xml +++ b/yuthon_hr_employee/views/website_employee_views.xml @@ -43,22 +43,24 @@
-