diff --git a/room/models/room_booking.py b/room/models/room_booking.py index 1b202b8e1..97ecd6fa5 100644 --- a/room/models/room_booking.py +++ b/room/models/room_booking.py @@ -168,7 +168,7 @@ class RoomBooking(models.Model): 'start_time': self.start_datetime, 'task_type':task_type.id, 'employee_ids': [(6, 0, employee_records.ids)], - 'state':'will', + 'task_state':'will', 'task_content': '面试安排' }) # 企业用户发送通知 diff --git a/yuthon_issue/views/issue_approval_decision_views.xml b/yuthon_issue/views/issue_approval_decision_views.xml index a963fba97..639c2199f 100644 --- a/yuthon_issue/views/issue_approval_decision_views.xml +++ b/yuthon_issue/views/issue_approval_decision_views.xml @@ -5,11 +5,11 @@ issue.approval.decision - + - + - + @@ -81,7 +81,7 @@ - + diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml index b23aa380f..5372d5565 100644 --- a/yuthon_property/views/yuthon_property_views.xml +++ b/yuthon_property/views/yuthon_property_views.xml @@ -75,7 +75,7 @@ - + diff --git a/yuthon_will_task/models/inherit_room_booking.py b/yuthon_will_task/models/inherit_room_booking.py index af4478896..379edb8cc 100644 --- a/yuthon_will_task/models/inherit_room_booking.py +++ b/yuthon_will_task/models/inherit_room_booking.py @@ -20,6 +20,7 @@ class InheritRoomBooking(models.Model): 'employee_ids': [(6, 0, employee_list)], 'task_time_ids': [(6, 0, task_time_ids.ids)], 'start_time': new_record.start_datetime, + 'task_state':'will', 'end_time': new_record.stop_datetime }) return new_record diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py index 1121649d8..3de8453ab 100644 --- a/yuthon_will_task/models/yuthon_will_task.py +++ b/yuthon_will_task/models/yuthon_will_task.py @@ -28,37 +28,36 @@ class YuthonWillTask(models.Model): task_time_ids = fields.Many2many('yuthon.task.time', string='提醒') start_time = fields.Datetime(string='开始时间', default=fields.Datetime.now) end_time = fields.Datetime(string='结束时间', default=lambda self: datetime.combine(datetime.now().date(), time(11, 0, 0))) - state = fields.Selection([('will', '待办'), ('done', '已办'), ('cancel', '取消')], default='will', string='状态', store=True) + task_state = fields.Selection([('will', '待办'), ('done', '已办'), ('cancel', '取消')], default='will', string='状态', store=True) @api.onchange('employee_ids') def _onchange_employee_ids(self): user_ids = [] + if self.user_id: + user_ids.append(self.user_id.id) for employee in self.employee_ids: if employee.user_id: user_ids.append(employee.user_id.id) + for employee2 in self.employee_ids2: + if employee2.user_id: + user_ids.append(employee2.user_id.id) + roles = self.employee_ids.mapped('user_role_id') + self.user_role_ids = roles self.users_ids = [(6, 0, user_ids)] def read_number(self): current_time = datetime.now() return self.search_count([ - ('state', '=', 'will'), + ('task_state', '=', 'will'), ('users_ids', 'in', self.env.user.id), ('end_time', '>', current_time) ]) - @api.onchange('employee_ids') - def onchange_employee_ids(self): - for task in self: - users = task.employee_ids.mapped('user_id') - roles = task.employee_ids.mapped('user_role_id') - task.users_ids = users - task.user_role_ids = roles - def will_task_time(self): - for i in self.search([('state', '=', 'will')]): + for i in self.search([('task_state', '=', 'will')]): if datetime.now() + timedelta(hours=8) > i.start_time: - i.write({'state': 'done'}) - for task in self.search([('state', '=', 'will')]): + i.write({'task_state': 'done'}) + for task in self.search([('task_state', '=', 'will')]): now = datetime.now() + timedelta(hours=8) start_time = task.start_time + timedelta(hours=8) _logger.info("定时任务执行中") @@ -121,7 +120,7 @@ class YuthonWillTask(models.Model): } def button_add_comment_cancel(self): - self.write({'state': 'cancel'}) + self.write({'task_state': 'cancel'}) employee_list = [i.id for i in self.employee_ids] + [i.id for i in self.employee_ids2] for employee_id in self.env['hr.employee'].search([('id', 'in', employee_list)]): if not employee_id.wecom_userid: diff --git a/yuthon_will_task/static/src/js/task_create_button.js b/yuthon_will_task/static/src/js/task_create_button.js index 039452190..ee2adb81e 100644 --- a/yuthon_will_task/static/src/js/task_create_button.js +++ b/yuthon_will_task/static/src/js/task_create_button.js @@ -16,7 +16,7 @@ export class CustomTaskListController extends ListController { view_type: 'form', views: [[false, 'form']], target: 'current', - context: {}, + context: {'task_state': 'will'}, }); } openMeetForm() { diff --git a/yuthon_will_task/views/yuthon_will_task_views.xml b/yuthon_will_task/views/yuthon_will_task_views.xml index 7fa045878..c47518f9f 100644 --- a/yuthon_will_task/views/yuthon_will_task_views.xml +++ b/yuthon_will_task/views/yuthon_will_task_views.xml @@ -5,7 +5,7 @@ yuthon.will.task - -