From 7770a89021a92eec86ea96efae68c473a0bdc505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Thu, 23 Apr 2026 10:29:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_will_task/models/yuthon_will_task.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py index a38152fbb..77a3d5955 100644 --- a/yuthon_will_task/models/yuthon_will_task.py +++ b/yuthon_will_task/models/yuthon_will_task.py @@ -259,7 +259,10 @@ class YuthonWillTask(models.Model): for employee_id in task.employee_ids: url = f'https://phone.thtzjt.com/phone/Schedule/{task.yuthon_will_task_id.id}/{employee_id.user_id.id}' request_hour_from = dict(task.yuthon_will_task_id._fields['request_hour_from'].selection).get(task.yuthon_will_task_id.request_hour_from, '') + '\n' - data_date = '开始时间:' + str(task.yuthon_will_task_id.start_date) + '--' + str(request_hour_from) + '\n' + _weekdays = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'] + _start = task.yuthon_will_task_id.start_date + _week_str = _weekdays[_start.weekday()] if _start else '' + data_date = '开始时间:' + str(_start) + ' ' + _week_str + '--' + str(request_hour_from) + '\n' data_name = "事项名称: " + task.yuthon_will_task_id.name + '\n' data_user_ids = '参与人: ' + ', '.join(will_id.employee_ids.mapped('name')) + '\n' data_employee_id = ('司机:' + ', '.join(will_id.employee_ids2.mapped('name')) + '\n') if will_id.employee_ids2 else '' @@ -273,7 +276,10 @@ class YuthonWillTask(models.Model): def button_add_comment(self): for employee_id in self.employee_ids + self.employee_ids2: - data_date = '开始时间:' + str(self.start_date) + str(self.request_hour_from) + '\n' + _weekdays2 = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'] + _week_str2 = _weekdays2[self.start_date.weekday()] if self.start_date else '' + _hour_from = dict(self._fields['request_hour_from'].selection).get(self.request_hour_from, '') + data_date = '开始时间:' + str(self.start_date) + ' ' + _week_str2 + '--' + _hour_from + '\n' data_name = "事项名称: " + self.name + '\n' data_user_ids = '参与人: ' + ', '.join(self.employee_ids.mapped('name')) + '\n' data_employee_id = ('司机:' + ', '.join(self.employee_ids2.mapped('name')) + '\n') if self.employee_ids2 else ''