!7736 1

Merge pull request !7736 from 李鹏宇/dev

soong_workflow/models/soong_workflow_mixin.py

@@ -623,6 +623,7 @@ class SoongWorkflowMixin(models.AbstractModel):
             "type": "ir.actions.act_window",
             "res_id": self.workflow_id.id,
             "target": "new",
+            "dialog_size": "medium",
             "context": {
                 "highlight_node_id": current_node_id.id,
                 "highlight_node_color": highlight_color,

sun_badge_menu/__manifest__.py

@@ -15,7 +15,7 @@
     ],
     "assets": {
         "web.assets_backend": [
-            "sun_badge_menu/static/src/webclient/actions/client_actions.js",
+            # "sun_badge_menu/static/src/webclient/actions/client_actions.js",
             "sun_badge_menu/static/src/webclient/navbar/navbar.js",
             "sun_badge_menu/static/src/webclient/navbar/navbar.xml"
         ],

yuthon_will_task/models/yuthon_will_task.py

@@ -84,7 +84,6 @@ class YuthonWillTask(models.Model):
     msg_id = fields.Char(string="msg_id")
 
     def back_wecom_msg(self):
-        # msg_id = 'tbqGFSu3GPn66h1H8k2y_zkyKFwpgq3m05CoDVHxZPQKpANdOlvHw4mYmChfPgH4Xwwse_t6bjOq1-gmNjrGNGu_VhKwxguyym-Q6IkoH5E'
         self.env['wecom.apps'].back_message(category='task', msg_id=self.msg_id)
 
 
@@ -201,11 +200,11 @@ class YuthonWillTask(models.Model):
             data_nota = ('备注:' + self.remarks) if self.remarks else ('') + '\n'
             data = data_date + data_name + data_user_ids + data_nota + data_employee_id
             url = f'https://phone.thtzjt.com/phone/Schedule/{self.id}/{employee_id.id}'
-            # self.sudo().env["wecom.apps"].sync_send_message_textcard(category='task', user_id=employee_id.wecom_userid,
-            #                                                          title="日程事项提醒", description=data, url=url, btntxt="详细信息")
+            self.sudo().env["wecom.apps"].sync_send_message_textcard(category='task', user_id=employee_id.wecom_userid,
+                                                                     title="日程事项提醒", description=data, url=url, btntxt="详细信息")
             test_msg_id = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='task', user_id="18562027762",
                                                                      title="日程事项提醒", description=data, url=url, btntxt="详细信息")
-            self.write({'msg_id': test_msg_id[-1]['msgid']})
+            # self.write({'msg_id': test_msg_id[-1]['msgid']})
         return {
             'type': 'ir.actions.client',
             'tag': 'display_notification',

yuthon_will_task/views/yuthon_will_task_views.xml

@@ -25,7 +25,7 @@
 <!--                <field name="employee_id" optional="hide"/>-->
 <!--                 <field name='creation_time' optional="hide"/>-->
                 <button name="button_add_comment" string="提醒" type="object" class="oe_highlight" invisible="task_state == 'cancel'"/>
-                <button name="back_wecom_msg" string="测试撤销" type="object" class="oe_highlight"/>
+<!--                <button name="back_wecom_msg" string="测试撤销" type="object" class="oe_highlight"/>-->
                 <button name="button_add_comment_cancel" string="取消" type="object" class="oe_highlight" invisible="task_state == 'cancel'"/>
                 <button name="schedule_reminders" string="提醒任务" type="object" class="oe_highlight" groups="base.group_system"/>
             </tree>
@@ -74,7 +74,7 @@
                     <group>
                         <label for="start_date"/>
                         <div class="d-inline-flex w-100">
-                            <field name="msg_id"/>
+<!--                            <field name="msg_id"/>-->
                             <field name="start_date" string="日期" class="me-2" style="max-width: 6rem !important;"/>
                             <field name="task_week" string="" class="me-2" style="max-width: 4rem !important;"/>
                             <field name="request_hour_from" string=" " class="ms-2" style="max-width: 5rem !important;"/>→