diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 822c6c43a..ab473a7ba 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -653,9 +653,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): url=url, btntxt="查看详情") if self.node_btn_name == "分发": if self.employee_ids: - record_id.log_ids[-1].write({"comment": self.comment, - "approval_state": "2", - "lase_click_date": fields.Datetime.now()}) + record_id.log_ids[-1].write({"comment": self.comment,"approval_state": "2", "lase_click_date": fields.Datetime.now()}) self.sudo().env["soong.workflow.log"].create({ "code": self.code, "model": self.res_model, @@ -697,36 +695,21 @@ class SoongWorkflowCommentWizard(models.TransientModel): title=record_id._description + "传阅/抄送", description=description, url=url, btntxt="查看详情") - if self.dep_manager_employee_ids: - for employee in self.dep_manager_employee_ids: - if not employee.wecom_userid: - raise ("请同步{}的企业微信".format(employee.name)) - record_id = self.env[self.res_model].search([('id', '=', self.res_id)]) - self.sudo().env["soong.workflow.record.copy"].create({ - "code": record_id.code, - "name": record_id.name, - "res_model": self.res_model, - "workflow_id": self.node_btn_id.workflow_id.id, - "res_id": self.res_id, - "done_by": employee.user_id.id, - "approval_state_copy": "0", - }) - url = f'https://oa.thtzjt.com/web#id={record_id.id}&cids=2&action={record_id.action.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["soong.workflow.log"].create({ - "code": self.code, - "model": self.res_model, - "res_id": self.res_id, - "node_id": record_id.workflow_id.node_ids[-1].id, - "workflow_id": self.node_btn_id.workflow_id.id, - "done_by": self.employee_ids.user_id.id, - "node_btn_name": "0", - }) + for employee in self.dep_manager_employee_ids: + record_id = self.env[self.res_model].search([('id', '=', self.res_id)]) + self.sudo().env["soong.workflow.log"].create({ + "code": self.code, + "model": self.res_model, + "res_id": self.res_id, + "node_id": record_id.workflow_id.node_ids[-1].id, + "workflow_id": self.node_btn_id.workflow_id.id, + "done_by": self.employee_ids.user_id.id, + "node_btn_name": "0", + }) + url = f'https://oa.thtzjt.com/web#id={record_id.id}&cids=2&action={record_id.action.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="查看详情") if self.node_btn_name == "收回": # recall_url = f'https://qyapi.weixin.qq.com/cgi-bin/message/recall?access_token={access_token}'