diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 4c087703b..be4d37b23 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -30,9 +30,9 @@ class SoongWorkflowCommentWizard(models.TransientModel): state_list = fields.Char(string="状态列表") record_id = fields.Integer() is_selection = fields.Boolean(string="是否自动选择") - trans_link_id = fields.Many2one('trans.link', string='转交节点') + trans_link_id = fields.Many2one('trans.link', string='转交节点', ondelete='set null') document_ids = fields.Many2many('ir.attachment', string="附件") - return_link_id = fields.Many2one('trans.link', string='退回节点') + return_link_id = fields.Many2one('trans.link', string='退回节点', ondelete='set null') invalid_link_ids = fields.Many2many( 'trans.link', string='审批人节点,跳过节点', @@ -445,18 +445,18 @@ class SoongWorkflowCommentWizard(models.TransientModel): for employee in self.employee_ids: action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0] url = f'https://oa.thtzjt.com/web#id={record_id.id}&cids=2&active_id={action_id.id}&model={record_id._name}&view_type=form' - result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', - user_id='18562027762', - title=record_id._description, - description="标题: {}\n".format( - record_id.name) + self.env.user.name + ' ' + str( - fields.Datetime.now() + timedelta( - hours=8)), - url=url, btntxt="查看详情") - msg_id = result_data[-1]['msgid'] - target_logs = next_node_log_records.filtered(lambda l: l.done_by.id == employee.user_id.id) - if target_logs: - target_logs.msg_id = msg_id + # result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', + # user_id='18562027762', + # title=record_id._description, + # description="标题: {}\n".format( + # record_id.name) + self.env.user.name + ' ' + str( + # fields.Datetime.now() + timedelta( + # hours=8)), + # url=url, btntxt="查看详情") + # msg_id = result_data[-1]['msgid'] + # target_logs = next_node_log_records.filtered(lambda l: l.done_by.id == employee.user_id.id) + # if target_logs: + # target_logs.msg_id = msg_id else: # 串审模式 (沿用原有逻辑) # 查找下一个节点 @@ -509,7 +509,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0] url = f'https://oa.thtzjt.com/web#id={record_id.id}&cids=2&action={action_id.id}&model={self.res_model}&view_type=from&menu_id={record_id.id}' description = "标题: {}\n".format(record_id.name) + self.env.user.name + ' ' + str(fields.Datetime.now() + timedelta(hours=8)) - self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id=employee.wecom_userid, title=record_id._description + "传阅/抄送",description=description, url=url, btntxt="查看详情") + # self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id=employee.wecom_userid, title=record_id._description + "传阅/抄送",description=description, url=url, btntxt="查看详情") if self.node_btn_name == '退回': record_id.write({'state': self.return_link_id.name}) next_node_id = record_id.workflow_id.node_ids.search([('name', '=', self.return_link_id.name), ('workflow_id', '=', record_id.workflow_id.id)]) @@ -758,8 +758,8 @@ class SoongWorkflowCommentWizard(models.TransientModel): menu_id = self.env.ref("yuthon_work_brand.menu_soong_workflow_todo_record").id return { "type": "ir.actions.client", - "tag": "reload", - "params": {"menu_id": menu_id, } + "tag": "flush_badge", + "params": {"menu_id": menu_id} } diff --git a/sun_badge_menu/__manifest__.py b/sun_badge_menu/__manifest__.py index 2dea42907..81ad773c6 100644 --- a/sun_badge_menu/__manifest__.py +++ b/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" ],