diff --git a/attendance_iot/views/attendance_iot_views.xml b/attendance_iot/views/attendance_iot_views.xml index 70229686d..3d1ee80c1 100644 --- a/attendance_iot/views/attendance_iot_views.xml +++ b/attendance_iot/views/attendance_iot_views.xml @@ -6,7 +6,7 @@
-
diff --git a/soong_workflow/models/soong_workflow_node.py b/soong_workflow/models/soong_workflow_node.py index 67929f9e8..dcad702a1 100644 --- a/soong_workflow/models/soong_workflow_node.py +++ b/soong_workflow/models/soong_workflow_node.py @@ -149,7 +149,7 @@ class SoongWorkflowNode(models.Model): "sequence": sequence + 1, "action_type": "end", "btn_hide": False, - "has_comment": False, + "has_comment": True, "review_type": "end", }) add_archive = (0, 0, { @@ -158,7 +158,7 @@ class SoongWorkflowNode(models.Model): "sequence": sequence + 2, "action_type": "code", "btn_hide": False, - "has_comment": False, + "has_comment": True, }) record.button_ids = remove_commands + [add_end, add_archive] @@ -184,7 +184,7 @@ class SoongWorkflowNode(models.Model): "sequence": sequence + 1, "action_type": "confirm", "btn_hide": False, # 对所有人显示 - "has_comment": False, # 对所有人显示 + "has_comment": True, # 对所有人显示 "review_type": "confirm", }), ] diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py index cbd6cbb84..f9c6e0508 100644 --- a/yuthon_hr_attendance/models/hr_attendance.py +++ b/yuthon_hr_attendance/models/hr_attendance.py @@ -371,12 +371,12 @@ class HrAttendance(models.Model): description='考勤异常请尽快处理', exception_alerts = True, url=url, btntxt="查看详情") - self.sudo().env["wecom.apps"].sync_send_message_textcard(category='att', - user_id='18562027762', - title='【考勤异常提醒】', - exception_alerts=True, - description='考勤异常请尽快处理', - url=url, btntxt="查看详情") + self.sudo().env["wecom.apps"].sync_send_message_textcard(category='att', + user_id='18562027762', + title='【考勤异常提醒】', + exception_alerts=True, + description='考勤异常请尽快处理', + url=url, btntxt="查看详情") def missing_card_judgment(self): today = fields.Date.today() diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py index 98eb87c05..08c8fe03f 100644 --- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py @@ -207,6 +207,9 @@ class YuthonOnboardApproval(models.Model): }) # employee_id.send_wecom_employee() employee_id.create_user() + iots = self.env['attendance.iot'].sudo().search([('company_id', '=', self.company_id.id)]) + for iot in iots: + iot.action_init_device() if self.job_id.name not in ['董事长', '总经理', '副总经理']: applet_security = self.env['applet.security'].sudo().search([ ('employee_id', '=', employee_id.id) diff --git a/yuthon_property_approval/views/inherit_yuthon_property_views.xml b/yuthon_property_approval/views/inherit_yuthon_property_views.xml index 342e7265b..e9c802272 100644 --- a/yuthon_property_approval/views/inherit_yuthon_property_views.xml +++ b/yuthon_property_approval/views/inherit_yuthon_property_views.xml @@ -689,6 +689,7 @@