diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py index 981ecb238..2d52a9b68 100644 --- a/yuthon_will_task/models/yuthon_will_task.py +++ b/yuthon_will_task/models/yuthon_will_task.py @@ -65,8 +65,8 @@ class YuthonWillTask(models.Model): ('22', '22:00'), ('22.25', '22:15'), ('22.5', '22:30'), ('22.75', '22:45'), ('23', '23:00'), ('23.25', '23:15'), ('23.5', '23:30'), ('23.75', '23:45')], string='结束时间', default='18') - priority = fields.Selection([('general', '不紧急不重要'), ('important', '重要不紧急'), - ('urgent', '紧急不重要'), ('very_urgent', '重要且紧急')], string='优先级', default='general') + priority = fields.Selection([('important', '重要不紧急'), + ('urgent', '紧急不重要'), ('very_urgent', '重要且紧急')], string='优先级') code = fields.Char(string="任务编号", default=lambda self: self.env['ir.sequence'].next_by_code('task_code')) user_id = fields.Many2one('res.users', string="创建人", default=lambda self: self.env.user) company_id = fields.Many2one('res.company', string="公司", default=lambda self: self.env.company) @@ -141,7 +141,7 @@ class YuthonWillTask(models.Model): from_time = hour_mapping.get(record.request_hour_from, "") to_time = hour_mapping.get(record.request_hour_to, "") if date_str and from_time and to_time: - record.task_time = f"{date_str} ({from_time}--{to_time})" + record.task_time = f"{date_str} {from_time}" else: record.task_time = "" diff --git a/yuthon_will_task/views/yuthon_will_task_views.xml b/yuthon_will_task/views/yuthon_will_task_views.xml index 1b11a4d06..047654fd8 100644 --- a/yuthon_will_task/views/yuthon_will_task_views.xml +++ b/yuthon_will_task/views/yuthon_will_task_views.xml @@ -8,7 +8,6 @@ decoration-muted = "task_state == 'cancel'" decoration-danger="priority == 'very_urgent'" decoration-info="priority == 'urgent'" - decoration-primary="priority == 'general'" decoration-success="priority == 'important'"> @@ -49,7 +48,6 @@
- @@ -120,7 +118,6 @@ decoration-muted = "task_state == 'cancel'" decoration-danger="priority == 'very_urgent'" decoration-info="priority == 'urgent'" - decoration-primary="priority == 'general'" decoration-success="priority == 'important'" create="false" edit="false" js_class="custom_task_tree_button"> @@ -148,8 +145,6 @@ -