Merge branch 'master' into dev

This commit is contained in:
pengyuthon
2026-01-24 16:31:52 +08:00
+9 -3
View File
@@ -121,15 +121,21 @@ class YuthonWillTask(http.Controller):
'id': task.id,
'name': task.name,
'employee_id': task.employee_id.name,
'employee_ids': ', '.join(task.employee_ids.mapped('name')),
'employee_ids': ','.join(task.employee_ids.mapped('name')),
'employee_ids2': ','.join(task.employee_ids2.mapped('name')),
'task_time_ids': ','.join(task.task_time_ids.mapped('name')),
'drivers': task.employee_ids2.read(['name']),
'employee': task.employee_ids.read(['name']),
'task_time': task.task_time_ids.read(['name']),
'employee_num': len(task.employee_ids),
'start_date': fields.Date.to_string(task.start_date),
'weekday': weekday_str,
'request_hour_from': '',
'request_hour_to': '',
'request_hour_from': task.request_hour_from,
'request_hour_to': task.request_hour_to,
'remarks': task.remarks,
'address': task.address,
'file_list': file_list,
'priority': task.priority,
}
hour_dict = dict(request_hour_selection)