diff --git a/yuthon_hr_employee/static/others/user_templat.xlsx b/yuthon_hr_employee/static/others/user_templat.xlsx
new file mode 100644
index 000000000..31abb9116
Binary files /dev/null and b/yuthon_hr_employee/static/others/user_templat.xlsx differ
diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index 1151b9d1f..b37d3b8a7 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -7,7 +7,7 @@
- 1
+ 上级领导
1
@@ -163,6 +163,26 @@
+
+ hr.employee.inherit.del.form
+ hr.employee
+
+
+
+ 1
+
+
+ 1
+
+
+ 上级领导
+
+
+
+
+
+
+
批量更新员工
diff --git a/yuthon_hr_employee/wizard/hr_employee_wizard.py b/yuthon_hr_employee/wizard/hr_employee_wizard.py
index e55618641..1a1ce59c2 100644
--- a/yuthon_hr_employee/wizard/hr_employee_wizard.py
+++ b/yuthon_hr_employee/wizard/hr_employee_wizard.py
@@ -35,7 +35,23 @@ class YuthonHrEmployeeWizard(models.Model):
def employee_user_data(self, row):
employee_name = self.env['hr.employee'].search([('name', '=', row[0].value)])
department_id = self.env['hr.department'].search([('name', '=', row[1].value.split('\\')[-1])])
- role_data = row[4].value
+ role_main = self.env['yuthon.user.role'].search([('name', '=', row[4].value)])
+ job = self.env['hr.job'].search([('name', '=', row[7].value)])
+ job_lv = self.env['yuthon.job.lv'].search([('name', '=', row[8].value)])
+ parent_id = self.env['hr.employee'].search([('name', '=', row[9].value)])
+ if role_main:
+ role_list_id = role_main
+ else:
+ role_list_id = self.env['yuthon.user.role'].create({'name': row[4].value})
+ if job:
+ job_id = job
+ else:
+ job_id = self.env['hr.job'].create({'name': row[7].value})
+ if job_lv:
+ job_lv_id = job_lv
+ else:
+ job_lv_id = self.env['yuthon.job.lv'].create({'name': row[8].value})
+ role_data = row[5].value
role_list_ids = []
for user in role_data.split(','):
user_role = self.env['yuthon.user.role'].search([('name', '=', user)])
@@ -49,10 +65,12 @@ class YuthonHrEmployeeWizard(models.Model):
'department_id': department_id.id,
'user_sex': 'boy' if row[2].value == '男' else 'girl',
'birthday': datetime.strptime(row[3].value, '%Y-%m-%d').date() if len(row[3].value) != 0 else '',
+ 'user_role_id': role_list_id,
'user_role_ids': role_list_ids,
- 'mobile_phone': row[5].value,
+ 'work_phone': row[6].value,
+ 'job_id': job_id,
+ 'job_lv_id': job_lv_id,
+ 'parent_id': parent_id,
}
if employee_name:
employee_name.write(employee_data)
- else:
- raise UserError('没有找到该员工%s,请检查用户信息' % (employee_name.name))
diff --git a/yuthon_hr_employee/wizard/hr_employee_wizard_views.xml b/yuthon_hr_employee/wizard/hr_employee_wizard_views.xml
index 97946a28f..1fd202c0d 100644
--- a/yuthon_hr_employee/wizard/hr_employee_wizard_views.xml
+++ b/yuthon_hr_employee/wizard/hr_employee_wizard_views.xml
@@ -1,14 +1,30 @@
-
+
+ 员工模板 下载
+ self
+ /yuthon_hr_employee/static/others/user_template.xlsx
+
+
+
审批意见弹窗
yuthon.hr.employee.wizard