!1033 pengyu

Merge pull request !1033 from 李鹏宇/dev

yuthon_will_task/models/yuthon_will_task.py

@@ -28,6 +28,7 @@ class YuthonWillTask(models.Model):
     start_time = fields.Datetime(string='开始时间', default=fields.Date.today())
     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='状态')
+    employee_id = fields.Many2one('hr.employee', string='司机')
 
     def read_number(self):
         return self.search_count([('state', '=', 'will'), ('user_ids', 'in', self.env.user.id)])
@@ -80,8 +81,13 @@ class YuthonWillTask(models.Model):
             if not employee_id.wecom_userid:
                 raise UserError("请同步{}的企业微信".format(employee_id.name))
             url = "https://oa.thtzjt.com/mail/view?model={}&res_id={}".format(self._name, self.id)
+            data_name = "事项名称: " + self.task_content + '\n'
+            data_start_time = '开始时间:' + str(self.start_time + timedelta(hours=8)) + '\n'
+            data_user_ids = '参与人: ' + ', '.join(self.employee_ids.mapped('name')) + '\n'
+            data_employee_id = ('司机:' + self.employee_id.name)if self.employee_id.name else ''
+            data = data_name + data_start_time + data_user_ids + data_employee_id
             self.sudo().env["wecom.apps"].sync_send_message_textcard(category='task', user_id=employee_id.wecom_userid,
-                                                                     title="日程事项提醒", description="事项名称: " + self.task_content + '\t' + str(self.start_time),
+                                                                     title="日程事项提醒", description=data,
                                                                      url=url, btntxt="详细信息")
         for record in self:
             partner_ids = record.employee_ids.user_id.partner_id.ids
@@ -100,7 +106,6 @@ class YuthonWillTask(models.Model):
         }
 
     def button_add_comment_cancel(self):
-        self.add_comment()
         for employee_id in self.employee_ids:
             if not employee_id.wecom_userid:
                 raise UserError("请同步{}的企业微信".format(employee_id.name))

yuthon_will_task/views/yuthon_will_task_views.xml

@@ -20,6 +20,7 @@
                 <field name='users_ids' widget="many2many_tags" optional="hide"/>
                 <field name='user_role_ids' widget="many2many_tags" optional="hide"/>
                 <field name='yuthon_company' optional="hide"/>
+                <field name='employee_id' domain="[('user_role_ids.name', 'ilike', ['司机'])]"/>
                 <field name='state'/>
                 <button name="button_add_comment" string="提醒" type="object" class="oe_highlight"/>
                 <button name="button_add_comment_cancel" string="取消" type="object" class="oe_highlight"/>